X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1b2a50a03b5beaf0d4f2e126bee875b6f66fc1bd..0d60b1108855359598c9ce7c383c1e7a33beb116:/cookbooks/mediawiki/templates/default/LocalSettings.php.erb?ds=sidebyside

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 1389dbabd..12d3fb167 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 -%>
@@ -95,6 +95,9 @@ $wgFileExtensions[] = 'pdf';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'svg';
+<% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
+	$wgFileExtensions[] = '<%= mw_extra_file_extension %>';
+<% end -%>
 
 $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height -o $output $input');
 $wgSVGConverter = 'rsvg';
@@ -195,6 +198,9 @@ $wgNamespacesWithSubpages[NS_MAIN] = true;
 $wgEnableDnsBlacklist = true;
 $wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.' );
 
+#Redirect validated email to edit
+$wgEmailConfirmToEdit = true;
+
 #Disable Hit Counter for Performance
 $wgDisableCounters = TRUE;
 #Disable IP in Header to avoid cache issue