X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9c0ae8b0766dec575fba6526a7672d06ab5bf5fb..f07069124c9ad841f765ed1114b51b801a39fce5:/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 2bd1a7297..cabc752a1 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -72,6 +72,9 @@ $wgDBmysql5 = false; ## Shared memory settings $wgMainCacheType = CACHE_MEMCACHED; +$wgParserCacheType = CACHE_MEMCACHED; +$wgMessageCacheType = CACHE_MEMCACHED; +$wgSessionCacheType = CACHE_MEMCACHED; $wgMemCachedServers = array('127.0.0.1:11211'); $wgSessionsInObjectCache = TRUE; @@ -95,6 +98,7 @@ $wgFileExtensions[] = 'odp'; $wgFileExtensions[] = 'ods'; $wgFileExtensions[] = 'svg'; $wgFileExtensions[] = 'osm'; +$wgFileExtensions[] = 'odg'; <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%> $wgFileExtensions[] = '<%= mw_extra_file_extension %>'; <% end -%> @@ -111,13 +115,6 @@ $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height $wgSVGConverter = 'rsvg'; $wgSVGMaxSize = 2000; -# InstantCommons allows wiki to use images from https://commons.wikimedia.org -<% if @mediawiki[:commons] -%> -$wgUseInstantCommons = true; -<% else -%> -$wgUseInstantCommons = false; -<% end -%> - ## If you use ImageMagick (or any other shell command) on a ## Linux server, this will need to be set to the name of an ## available UTF-8 locale @@ -176,16 +173,6 @@ $wgResourceLoaderMaxQueryLength = -1; # Only Allow Signed-in users to edit $wgGroupPermissions['*']['edit'] = false; -# Only allow autoconfirmed for a few actions -$wgGroupPermissions['user']['move'] = false; -$wgGroupPermissions['user']['movefile'] = false; -$wgGroupPermissions['user']['move-categorypages'] = false; -$wgGroupPermissions['user']['upload'] = 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['bureaucrat']['hideuser'] = true; $wgGroupPermissions['bureaucrat']['deletelogentry'] = true; @@ -214,8 +201,8 @@ $wgGroupPermissions['sysop']['gadgets-definition-edit'] = true; $wgGroupPermissions['*']['createaccount'] = false; $wgGroupPermissions['user']['createaccount'] = true; <% end -%> -<% if @mediawiki[:private_site] -%> +<% if @mediawiki[:private_site] -%> # Disable reading by anonymous users $wgGroupPermissions['*']['read'] = false; @@ -229,19 +216,17 @@ $wgGroupPermissions['*']['createaccount'] = false; $wgUploadPath = "$wgScriptPath/img_auth.php"; <% end -%> -<% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%> -# user group "confirmed" with identical rights as "autoconfirmed", but assigned manually by sysops -$wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed']; -$wgAddGroups['sysop'][] = 'confirmed'; -$wgRemoveGroups['sysop'][] = 'confirmed'; -<% end -%> - # Allow Subpages on Main Namespace $wgNamespacesWithSubpages[NS_MAIN] = true; # DNS Blacklists to use $wgEnableDnsBlacklist = true; -$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.', 'dnsbl-2.uceprotect.net.' ); +$wgDnsBlacklistUrls = [ + 'proxies.dnsbl.sorbs.net.', + 'opm.tornevall.org.', + 'xbl.spamhaus.org.', + 'dnsbl-2.uceprotect.net.' +]; # Require validated email to edit $wgEmailConfirmToEdit = true; @@ -249,35 +234,62 @@ $wgEmailConfirmToEdit = true; # Extend autoblock period $wgAutoblockExpiry = 7776000; // 90 days -# Autopromote users to autoconfirmed -$wgAutoConfirmAge = 345600; // 4 days -$wgAutoConfirmCount = 10; - # Disable Hit Counter for Performance $wgDisableCounters = TRUE; # Disable IP in Header to avoid cache issue $wgShowIPinHeader = FALSE; -# Job Runs mostly by cron -$wgJobRunRate = 0.01; +# Job Runs by cron +$wgJobRunRate = 0; # dissolves double redirects automatically $wgFixDoubleRedirects = TRUE; # Allow external images from a few sites -$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 -# defines which links of the sidebar are translatable -$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' ); +$wgAllowExternalImagesFrom = [ + 'http://tile.openstreetmap.org/', + 'https://tile.openstreetmap.org', + 'http://josm.openstreetmap.de/' +]; + +$wgNoFollowDomainExceptions = [ + 'www.openstreetmap.org', + 'josm.openstreetmap.de', + 'taginfo.openstreetmap.org', + 'blog.openstreetmap.org', + 'forum.openstreetmap.org', + 'community.openstreetmap.org', + 'lists.openstreetmap.org', + 'help.openstreetmap.org', + 'switch2osm.org', + 'wiki.osmfoundation.org', + 'www.openstreetmap.us', + 'learnosm.org', + 'nominatim.org', + 'openstreetmap.community', + 'www.openstreetbrowser.org', + 'openinframap.org', + 'leafletjs.com' +]; # FIXME - move to specific $wgAllowUserJs = TRUE; $wgAllowUserCss = TRUE; -# FIXME - move to specific +# 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 -%> +<% if @mediawiki[:site_readonly] -%> +$wgReadOnly = "<%= @mediawiki[:site_readonly] %>"; +<% end -%> + +<% if @name == "wiki.openstreetmap.org" -%> # DE define('NS_LANG_DE', 200); $wgExtraNamespaces[NS_LANG_DE] = 'DE'; @@ -341,6 +353,17 @@ define('NS_LANG_JA_TALK', 213); $wgExtraNamespaces[NS_LANG_JA_TALK] = 'JA_talk'; $wgNamespacesWithSubpages[NS_LANG_JA_TALK] = TRUE; +# Proposal +# namespace features a specific search weight defined at +# cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb +define('NS_PROPOSAL', 3000); +$wgExtraNamespaces[NS_PROPOSAL] = 'Proposal'; +$wgNamespacesWithSubpages[NS_PROPOSAL] = TRUE; +$wgContentNamespaces[] = NS_PROPOSAL; +define('NS_PROPOSAL_TALK', 3001); +$wgExtraNamespaces[NS_PROPOSAL_TALK] = 'Proposal talk'; +$wgNamespacesWithSubpages[NS_PROPOSAL_TALK] = TRUE; + $wgNamespacesToBeSearchedDefault[NS_LANG_DE] = TRUE; $wgNamespacesToBeSearchedDefault[NS_LANG_FR] = TRUE; $wgNamespacesToBeSearchedDefault[NS_LANG_ES] = TRUE; @@ -348,21 +371,56 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_IT] = TRUE; $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE; $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE; $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE; +$wgNamespacesToBeSearchedDefault[NS_PROPOSAL] = TRUE; +# defines which links of the sidebar are translatable +$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' ); +<% end -%> -# 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; - +# load extensions +<% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%> +<%= "require_once('#{file}');" %> +<% end -%> -<% if @mediawiki[:site_notice] -%> -$wgSiteNotice = "<%= @mediawiki[:site_notice] %>"; +<% if @name == "wiki.openstreetmap.org" -%> +# Placeholder for the wiki.openstreetmap.org specific config <% end -%> -<% if @mediawiki[:site_readonly] -%> -$wgReadOnly = "<%= @mediawiki[:site_readonly] %>"; + +<% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%> +# require user confirmation for certain actions +$wgGroupPermissions['user']['move'] = false; +$wgGroupPermissions['user']['movefile'] = false; +$wgGroupPermissions['user']['move-categorypages'] = false; +$wgGroupPermissions['user']['upload'] = false; +$wgGroupPermissions['autoconfirmed']['move'] = true; +$wgGroupPermissions['autoconfirmed']['movefile'] = true; +$wgGroupPermissions['autoconfirmed']['move-categorypages'] = true; +$wgGroupPermissions['autoconfirmed']['upload'] = true; +# Autopromote users to autoconfirmed +$wgAutoConfirmAge = 345600; // 4 days +$wgAutoConfirmCount = 10; + +# user group "confirmed" with identical rights as "autoconfirmed", but assigned manually by sysops +$wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed']; +$wgAddGroups['sysop'][] = 'confirmed'; +$wgRemoveGroups['sysop'][] = 'confirmed'; <% end -%> -<% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%> -<%= "require_once('#{file}');" %> +<% if @mediawiki[:private_accounts] or @mediawiki[:private_site] -%> +# disable automatic confirmation of users, grant all "autoconfirmed" rights to all users +$wgAutoConfirmAge = 0; +$wgAutoConfirmCount = 0; +$wgGroupPermissions['user'] = array_merge( $wgGroupPermissions['user'], $wgGroupPermissions['autoconfirmed'] ); + +unset( $wgGroupPermissions['autoconfirmed'] ); +unset( $wgRevokePermissions['autoconfirmed'] ); +unset( $wgAddGroups['autoconfirmed'] ); +unset( $wgRemoveGroups['autoconfirmed'] ); +unset( $wgGroupsAddToSelf['autoconfirmed'] ); +unset( $wgGroupsRemoveFromSelf['autoconfirmed'] ); <% end -%> + +# Increase curl timeout to allow parsoid requests to heavy pages like Map Features +# Mediawiki 1.38 has fix to allow this to be set by $wgVirtualRestConfig +# https://phabricator.wikimedia.org/T285478 +$wgHTTPTimeout = 90;