Update some custom resources for Chef 14 compatibility

[chef.git] / 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 85151cfdf7d754c3ed110daee4042c1433b751d8..af0a688696bf84719570796495b59200fb1b9bc2 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -28,7 +28,7 @@ $wgInternalServer   = 'http://<%= @name %>';
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;

-$wgDefaultUserOptions['prefershttps'] = 0;
+$wgDefaultUserOptions['prefershttps'] = 1;

 <% end -%>
 $wgCookieSecure = false;
 
 <% end -%>
 $wgCookieSecure = false;
 


@@ -93,6 +93,7 @@ $wgFileExtensions[] = 'doc';
 $wgFileExtensions[] = 'pdf';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
 $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 %>';
 $wgFileExtensions[] = 'svg';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
        $wgFileExtensions[] = '<%= mw_extra_file_extension %>';


@@ -141,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.
 ## 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";
 $wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";


@@ -168,9 +169,9 @@ $wgGroupPermissions['user']['move'] = false;
 $wgGroupPermissions['user']['movefile'] = false;
 $wgGroupPermissions['user']['move-categorypages'] = false;
 $wgGroupPermissions['user']['upload'] = 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
 $wgGroupPermissions['autoconfirmed']['upload'] = true;
 
 #Allow bureaucrat group access to oversight options


@@ -312,6 +313,9 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = 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 -%>
 <% if @mediawiki[:site_readonly] -%>
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>