Convert some URLs to https

[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 ce4f07229db2086bf1d043583a9d9a2cec58bd60..115bfedd2a49e396f8f76da298f08db490368325 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -12,12 +12,11 @@ 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
 ## (like /w/index.php/Page_title to /wiki/Page_title) please see:
 ## 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
 ## (like /w/index.php/Page_title to /wiki/Page_title) please see:

-## http://www.mediawiki.org/wiki/Manual:Short_URL
+## https://www.mediawiki.org/wiki/Manual:Short_URL

 $wgScriptPath       = "/w";
 $wgArticlePath      = '/wiki/$1';
 $wgUsePathInfo      = true;
 $wgScriptPath       = "/w";
 $wgArticlePath      = '/wiki/$1';
 $wgUsePathInfo      = true;


@@ -25,11 +24,11 @@ $wgScriptExtension  = ".php";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";

-$wgInternalServer   = 'http://<%= @name %>';
+$wgInternalServer   = 'https://<%= @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;
 


@@ -94,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 %>';


@@ -103,7 +103,7 @@ $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height
 $wgSVGConverter = 'rsvg';
 $wgSVGMaxSize = 2000;
 
 $wgSVGConverter = 'rsvg';
 $wgSVGMaxSize = 2000;
 

-# InstantCommons allows wiki to use images from http://commons.wikimedia.org
+# InstantCommons allows wiki to use images from https://commons.wikimedia.org

 <% if @mediawiki[:commons] -%>
 $wgUseInstantCommons  = true;
 <% else -%>
 <% if @mediawiki[:commons] -%>
 $wgUseInstantCommons  = true;
 <% else -%>


@@ -142,8 +142,8 @@ $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
-$wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
+$wgRightsPage = "Wiki_content_license"; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsUrl  = "https://creativecommons.org/licenses/by-sa/2.0/";

 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";
 
 $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['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


@@ -211,6 +211,12 @@ $wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', '
 #Require validated email to edit
 $wgEmailConfirmToEdit = true;
 
 #Require validated email to edit
 $wgEmailConfirmToEdit = true;
 

+# Extend autoblock period
+$wgAutoblockExpiry = 7776000; // 90 days
+
+# Spam filter regex
+$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
 $wgAutoConfirmCount = 10;
 #Autopromote users to autoconfirmed
 $wgAutoConfirmAge = 345600; // 4 days
 $wgAutoConfirmCount = 10;


@@ -307,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 -%>