From: Grant Slater <git@firefishy.com>
Date: Sat, 2 Jan 2016 09:57:35 +0000 (+0000)
Subject: Mediawiki: fixes
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5ab2fa964268ac233bcdf90a18f9c6bfb22f027a?hp=f185f204ede20ff19f632d958f7de2e0dd510c95

Mediawiki: fixes
---

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php b/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
similarity index 100%
rename from cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php
rename to cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
diff --git a/cookbooks/mediawiki/templates/default/parsoid-settings.js.erb b/cookbooks/mediawiki/templates/default/parsoid-settings.js.erb
index f5bc8cb87..896064bdc 100644
--- a/cookbooks/mediawiki/templates/default/parsoid-settings.js.erb
+++ b/cookbooks/mediawiki/templates/default/parsoid-settings.js.erb
@@ -20,8 +20,8 @@ exports.setup = function(parsoidConfig) {
 	// The URL of your MediaWiki API endpoint.
 	//parsoidConfig.setMwApi({ prefix: 'localhost', uri: 'http://localhost/w/api.php' });
 
-	<% node[:mediawiki][:sites].keys.sort.each do |mediawiki_name| -%>
-  parsoidConfig.setMwApi({ uri: 'http://<%= @mediawiki_name %>/w/api.php' });
+	<% node[:mediawiki][:sites].keys.sort.each do |site_url| -%>
+  parsoidConfig.setMwApi({ uri: 'http://<%= site_url %>/w/api.php' });
 	<% end -%>
 
 	// To specify a proxy (or proxy headers) specific to this prefix (which