mediawiki: ignore tar file-changed warning

[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 0895fb052f22ac1ed1b200d650bed68da768e6ba..80a5e8710e29e62b7accfe9055ecefa01318f06b 100644 (file)
--- 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] %>';
 
 $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
 ## 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;
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;

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

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


@@ -142,7 +141,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";


@@ -169,9 +168,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


@@ -215,7 +214,7 @@ $wgEmailConfirmToEdit = true;
 $wgAutoblockExpiry = 7776000; // 90 days
 
 # Spam filter regex
 $wgAutoblockExpiry = 7776000; // 90 days
 
 # Spam filter regex

-$wgSpamRegex = '/\b(epson|brother|canon|hp|kodak|lexmark|mcafee|norton|avira|kaspersky|avg|avast|microsoft|outlook|printer)( helpline|( customer| technical| tech)?| customer service)? (support number|phone number)\b/i';
+$wgSpamRegex = '/\b(gmail|dell|asus|eps(o|0)n|br(o|0)ther|can(o|0)n|hp|k(o|0)dak|lexmark|mcafee|bitdefender|n(o|0)rt(o|0)n( 360)?|avira|kaspersky|avg|avast|micr(o|0)s(o|0)ft|(o|0)utl(o|0)(o|0)k|printer|netgear( r(o|0)uter)?|quickb(o|0)(o|0)ks( payr(o|0)ll)?)( antivirus)?( helpline| cust(o|0)mer|( technical| tech)| cust(o|0)mer service)? (supp(o|0)rt number|ph(o|0)ne number|supp(o|0)rt ph(o|0)ne number|care number|helpdesk number)\b/i';

 
 #Autopromote users to autoconfirmed
 $wgAutoConfirmAge = 345600; // 4 days
 
 #Autopromote users to autoconfirmed
 $wgAutoConfirmAge = 345600; // 4 days


@@ -313,6 +312,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 -%>