From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Mar 2015 14:19:44 +0000 (+0100)
Subject: Fix a couple of wiki settings issues
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/6429fcc7b71c46fdc64d38e31d044a0abf2ce627

Fix a couple of wiki settings issues
---

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 67fa0000a..68b56e6cc 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -73,6 +73,7 @@ def mediawiki_params
     :skin => skin,
     :site_notice => site_notice,
     :site_readonly => site_readonly,
+    :ssl_enabled => ssl_enabled,
     :private_accounts => private_accounts,
     :private => private
   }
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 1389dbabd..b460c98d0 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -24,10 +24,10 @@ $wgUsePathInfo      = true;
 $wgScriptExtension  = ".php";
 
 ## The protocol and server name to use in fully-qualified URLs
-$wgServer           = "//<%= @mediawiki[:site] %>";
-$wgInternalServer   = 'http://<%= @mediawiki[:site] %>';
+$wgServer           = "//<%= @name %>";
+$wgInternalServer   = 'http://<%= @name %>';
 
-<% if @mediawiki[:enable_ssl] -%>
+<% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
 $wgDefaultUserOptions['prefershttps'] = 0;
 <% end -%>