Allow adding core and additional Mediawiki skins. (enterprisemediawik…

…i#997)
freephile · Jun 10, 2019 · 15bd229 · 15bd229
1 parent 3cbe50b
commit 15bd229
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/roles/mediawiki/tasks/main.yml b/src/roles/mediawiki/tasks/main.yml
@@ -83,7 +83,7 @@
           ignoreSubmodules = all
 
 #
-# SKINS
+# EXTENSIONS AND SKINS
 #
 # FIXME #819: Add skins in Meza(Core|Local)Extensions.yml
 - name: Ensure Vector skin installed

diff --git a/src/roles/mediawiki/templates/composer.local.json.j2 b/src/roles/mediawiki/templates/composer.local.json.j2
@@ -17,8 +17,8 @@
 		{%- endfor -%}
 
 		{%- for ext in meza_core_extensions['list'] if ext.composer is defined %}
-		"{{ ext.composer }}": "{{ ext.version }}",
-		{# Note: pear/net_smtp is part of MW core in 1.32+. Need to add conditional comma here when pear/net_smtp is removed below. #}
+		"{{ ext.composer }}": "{{ ext.version }}"
+		{%- if not loop.last -%},{%- endif %}
 		{%- endfor %}
 
 		"pear/net_smtp": "1.8.0"