X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a2104107771eb06e5f3cdbfe5ebb58fe86fe8b14..337b09717d393293f42859c0623ca588c3692ea5:/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 115bfedd2..e6a0866d2 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -25,12 +25,11 @@ $wgScriptExtension  = ".php";
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";
 $wgInternalServer   = 'https://<%= @name %>';
+$wgCanonicalServer  = 'https://<%= @name %>';
 
-<% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
 $wgDefaultUserOptions['prefershttps'] = 1;
-<% end -%>
-$wgCookieSecure = false;
+$wgCookieSecure = true;
 
 ## The relative URL path to the skins directory
 $wgStylePath        = "$wgScriptPath/skins";
@@ -95,10 +94,19 @@ $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'ods';
 $wgFileExtensions[] = 'svg';
+$wgFileExtensions[] = 'osm';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
 	$wgFileExtensions[] = '<%= mw_extra_file_extension %>';
 <% end -%>
 
+# Add OSM XML file format per http://www.iana.org/assignments/media-types/media-types.xhtml
+# Shout out to Paul Norman for reserving this.
+# Helps MimeMagic determine XML-based formats and chooses the correct MimeType
+# for .osm files.
+$wgXMLMimeTypes[] = array('osm' => 'application/vnd.openstreetmap.data+xml');
+
+$wgTrustedMediaFormats[] = 'application/vnd.openstreetmap.data+xml';
+
 $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height -o $output $input');
 $wgSVGConverter = 'rsvg';
 $wgSVGMaxSize = 2000;
@@ -129,6 +137,10 @@ $wgShellLocale = "en_US.utf8";
 # Site language code, should be one of the list in ./languages/Names.php
 $wgLanguageCode = "en";
 
+## Enable setting the page content language by users
+$wgPageLanguageUseDB = true;
+$wgGroupPermissions['user']['pagelang'] = true;
+
 $wgSecretKey = '<%= @node[:mediawiki][:sites][@name][:wgSecretKey] %>';
 
 # Site upgrade key. Must be set to a string (default provided) to turn on the
@@ -161,10 +173,10 @@ $wgResourceLoaderMaxQueryLength = -1;
 # End of automatically generated settings.
 # Add more configuration options below.
 
-#Only Allow Signed-in users to edit
+# Only Allow Signed-in users to edit
 $wgGroupPermissions['*']['edit'] = false;
 
-#Only allow autoconfirmed for a few actions
+# Only allow autoconfirmed for a few actions
 $wgGroupPermissions['user']['move'] = false;
 $wgGroupPermissions['user']['movefile'] = false;
 $wgGroupPermissions['user']['move-categorypages'] = false;
@@ -174,7 +186,7 @@ $wgGroupPermissions['autoconfirmed']['movefile'] = true;
 $wgGroupPermissions['autoconfirmed']['move-categorypages'] = true;
 $wgGroupPermissions['autoconfirmed']['upload'] = true;
 
-#Allow bureaucrat group access to oversight options
+# Allow bureaucrat group access to oversight options
 $wgGroupPermissions['bureaucrat']['hideuser'] = true;
 $wgGroupPermissions['bureaucrat']['deletelogentry'] = true;
 $wgGroupPermissions['bureaucrat']['deleterevision'] = true;
@@ -182,33 +194,33 @@ $wgGroupPermissions['bureaucrat']['suppressrevision'] = true;
 $wgGroupPermissions['bureaucrat']['suppressionlog'] = true;
 
 <% if @mediawiki[:private_accounts] -%>
-#Prevent new user registrations except by existing users
+# Prevent new user registrations except by existing users
 $wgGroupPermissions['*']['createaccount'] = false;
 $wgGroupPermissions['user']['createaccount'] = true;
 <% end -%>
-<% if @mediawiki[:private] -%>
+<% if @mediawiki[:private_site] -%>
 
-#Disable reading by anonymous users
+# Disable reading by anonymous users
 $wgGroupPermissions['*']['read'] = false;
 
-#Allow anonymous users to access the login page
+# Allow anonymous users to access the login page
 $wgWhitelistRead = array ("Special:Userlogin");
 
-#Prevent new user registrations except by sysops
+# Prevent new user registrations except by sysops
 $wgGroupPermissions['*']['createaccount'] = false;
 
-#Restrict access to the upload directory
+# Restrict access to the upload directory
 $wgUploadPath = "$wgScriptPath/img_auth.php";
 <% end -%>
 
-#Allow Subpages on Main Namespace
+# Allow Subpages on Main Namespace
 $wgNamespacesWithSubpages[NS_MAIN] = true;
 
-#DNS Blacklists to use
+# DNS Blacklists to use
 $wgEnableDnsBlacklist = true;
 $wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.', 'dnsbl-3.uceprotect.net.' );
 
-#Require validated email to edit
+# Require validated email to edit
 $wgEmailConfirmToEdit = true;
 
 # Extend autoblock period
@@ -217,32 +229,35 @@ $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
+# Autopromote users to autoconfirmed
 $wgAutoConfirmAge = 345600; // 4 days
 $wgAutoConfirmCount = 10;
 
-#Disable Hit Counter for Performance
+# Disable Hit Counter for Performance
 $wgDisableCounters = TRUE;
-#Disable IP in Header to avoid cache issue
+# Disable IP in Header to avoid cache issue
 $wgShowIPinHeader = FALSE;
 
-#Job Runs by cron
-$wgJobRunRate = 0;
+# Job Runs mostly by cron
+$wgJobRunRate = 0.01;
+
+# dissolves double redirects automatically
+$wgFixDoubleRedirects = TRUE;
 
 # Allow external images from a few sites
-$wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'http://svenanders.openstreetmap.de/', 'http://josm.openstreetmap.de/', 'http://trac.openstreetmap.org/', 'http://rweait.dev.openstreetmap.org/' );
+$wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://tile.openstreetmap.org', 'http://josm.openstreetmap.de/', 'http://trac.openstreetmap.org/', 'http://rweait.dev.openstreetmap.org/' );
 
 $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' );
 
-#FIXME - move to specific
+# FIXME - move to specific
 $wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'portal-url', 'mapfeatures-url', 'helppage' );
 
-#FIXME - move to specific
+# FIXME - move to specific
 $wgAllowUserJs = TRUE;
 $wgAllowUserCss = TRUE;
 
-#FIXME - move to specific
-#DE
+# FIXME - move to specific
+# DE
 define('NS_LANG_DE', 200);
 $wgExtraNamespaces[NS_LANG_DE] = 'DE';
 $wgNamespacesWithSubpages[NS_LANG_DE] = TRUE;
@@ -251,7 +266,7 @@ define('NS_LANG_DE_TALK', 201);
 $wgExtraNamespaces[NS_LANG_DE_TALK] = 'DE_talk';
 $wgNamespacesWithSubpages[NS_LANG_DE_TALK] = TRUE;
 
-#FR
+# FR
 define('NS_LANG_FR', 202);
 $wgExtraNamespaces[NS_LANG_FR] = 'FR';
 $wgNamespacesWithSubpages[NS_LANG_FR] = TRUE;
@@ -260,7 +275,7 @@ define('NS_LANG_FR_TALK', 203);
 $wgExtraNamespaces[NS_LANG_FR_TALK] = 'FR_talk';
 $wgNamespacesWithSubpages[NS_LANG_FR_TALK] = TRUE;
 
-#ES
+# ES
 define('NS_LANG_ES', 204);
 $wgExtraNamespaces[NS_LANG_ES] = 'ES';
 $wgNamespacesWithSubpages[NS_LANG_ES] = TRUE;
@@ -269,7 +284,7 @@ define('NS_LANG_ES_TALK', 205);
 $wgExtraNamespaces[NS_LANG_ES_TALK] = 'ES_talk';
 $wgNamespacesWithSubpages[NS_LANG_ES_TALK] = TRUE;
 
-#IT
+# IT
 define('NS_LANG_IT', 206);
 $wgExtraNamespaces[NS_LANG_IT] = 'IT';
 $wgNamespacesWithSubpages[NS_LANG_IT] = TRUE;
@@ -278,7 +293,7 @@ define('NS_LANG_IT_TALK', 207);
 $wgExtraNamespaces[NS_LANG_IT_TALK] = 'IT_talk';
 $wgNamespacesWithSubpages[NS_LANG_IT_TALK] = TRUE;
 
-#NL
+# NL
 define('NS_LANG_NL', 208);
 $wgExtraNamespaces[NS_LANG_NL] = 'NL';
 $wgNamespacesWithSubpages[NS_LANG_NL] = TRUE;
@@ -287,7 +302,7 @@ define('NS_LANG_NL_TALK', 209);
 $wgExtraNamespaces[NS_LANG_NL_TALK] = 'NL_talk';
 $wgNamespacesWithSubpages[NS_LANG_NL_TALK] = TRUE;
 
-#RU
+# RU
 define('NS_LANG_RU', 210);
 $wgExtraNamespaces[NS_LANG_RU] = 'RU';
 $wgNamespacesWithSubpages[NS_LANG_RU] = TRUE;
@@ -296,7 +311,7 @@ define('NS_LANG_RU_TALK', 211);
 $wgExtraNamespaces[NS_LANG_RU_TALK] = 'RU_talk';
 $wgNamespacesWithSubpages[NS_LANG_RU_TALK] = TRUE;
 
-#JA
+# JA
 define('NS_LANG_JA', 212);
 $wgExtraNamespaces[NS_LANG_JA] = 'JA';
 $wgNamespacesWithSubpages[NS_LANG_JA] = TRUE;
@@ -313,6 +328,13 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
 
+
+# Raise expensive lua (and other function) call limits to match WP
+# Docs:  https://www.mediawiki.org/wiki/Manual:$wgExpensiveParserFunctionLimit
+# Wikipedia's Config:  https://noc.wikimedia.org/conf/highlight.php?file=CommonSettings.php
+$wgExpensiveParserFunctionLimit = 500;
+
+
 <% if @mediawiki[:site_notice] -%>
 $wgSiteNotice = "<%= @mediawiki[:site_notice] %>";
 <% end -%>