X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/27d743a7835e5d1f2d8899a7f616809b40a2d2c5..34666b81c1ff78ac49e2afb85f6cabf8742dfb4c:/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 d61e1bb3d..af0a68869 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -12,7 +12,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 $wgSitename      = '<%= @mediawiki[:sitename] %>';
 $wgMetaNamespace = '<%= @mediawiki[:metanamespace] %>';
 
-
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs
@@ -29,7 +28,7 @@ $wgInternalServer   = 'http://<%= @name %>';
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
-$wgDefaultUserOptions['prefershttps'] = 0;
+$wgDefaultUserOptions['prefershttps'] = 1;
 <% end -%>
 $wgCookieSecure = false;
 
@@ -94,6 +93,7 @@ $wgFileExtensions[] = 'doc';
 $wgFileExtensions[] = 'pdf';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
+$wgFileExtensions[] = 'ods';
 $wgFileExtensions[] = 'svg';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
 	$wgFileExtensions[] = '<%= mw_extra_file_extension %>';
@@ -142,7 +142,7 @@ $wgDefaultSkin = "<%= @mediawiki[:skin] %>";
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
 ## License and Creative Commons licenses are supported so far.
-$wgRightsPage = "OpenStreetMap_License"; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsPage = "Wiki_content_license"; # Set to the title of a wiki page that describes your license/copyright
 $wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";
@@ -169,9 +169,9 @@ $wgGroupPermissions['user']['move'] = false;
 $wgGroupPermissions['user']['movefile'] = false;
 $wgGroupPermissions['user']['move-categorypages'] = false;
 $wgGroupPermissions['user']['upload'] = false;
-$wgGroupPermissions['autoconfirmed']['move'] = false;
-$wgGroupPermissions['autoconfirmed']['movefile'] = false;
-$wgGroupPermissions['autoconfirmed']['move-categorypages'] = false;
+$wgGroupPermissions['autoconfirmed']['move'] = true;
+$wgGroupPermissions['autoconfirmed']['movefile'] = true;
+$wgGroupPermissions['autoconfirmed']['move-categorypages'] = true;
 $wgGroupPermissions['autoconfirmed']['upload'] = true;
 
 #Allow bureaucrat group access to oversight options
@@ -313,6 +313,9 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
 
+<% if @mediawiki[:site_notice] -%>
+$wgSiteNotice = "<%= @mediawiki[:site_notice] %>";
+<% end -%>
 <% if @mediawiki[:site_readonly] -%>
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>