X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/8b72732cd79ec76f34a560cfd9f1d526d7a7ce7e..6429fcc7b71c46fdc64d38e31d044a0abf2ce627:/cookbooks/mediawiki/templates/default/LocalSettings.php.erb diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb index 9f6ecb217..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 -%> @@ -291,7 +291,6 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE; $wgReadOnly = "<%= @mediawiki[:site_readonly] %>"; <% end -%> -<% Dir.glob("#{@mediawiki[:directory]}/LocalSettings.d/*.php") do |file| -%> +<% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%> <%= "require_once('#{file}');" %> <% end -%> -