X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..07840ceab6077ffa7c498daeda4ecbd591c3bc40:/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 dff320d56..93aab016d 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -54,6 +54,15 @@ $wgEmailAuthentication = true; $wgEnotifUseJobQ = true; +$wgSMTP = [ + "host" => "localhost", + "socket_options" => [ + "ssl" => [ + "verify_peer_name" => false + ] + ] +]; + ## Database settings $wgDBtype = "mysql"; $wgDBserver = "<%= @database_params[:host] %>"; @@ -72,6 +81,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; @@ -112,22 +124,6 @@ $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height $wgSVGConverter = 'rsvg'; $wgSVGMaxSize = 2000; -<% if @mediawiki[:commons] -%> -# Enable use of images from https://commons.wikimedia.org -$wgForeignFileRepos[] = [ - 'class' => ForeignAPIRepo::class, - 'name' => 'wikimediacommons', - 'apibase' => 'https://commons.wikimedia.org/w/api.php', - 'url' => 'https://upload.wikimedia.org/wikipedia/commons', - 'thumbUrl' => 'https://upload.wikimedia.org/wikipedia/commons/thumb', - 'hashLevels' => 2, - 'transformVia404' => true, - 'fetchDescription' => true, - 'descriptionCacheExpiry' => 604800, - 'apiThumbCacheExpiry' => 604800, -]; -<% 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 @@ -142,7 +138,7 @@ $wgShellLocale = "en_US.utf8"; ## Set $wgCacheDirectory to a writable directory on the web server ## to make your wiki go slightly faster. The directory should not ## be publically accessible from the web. -#$wgCacheDirectory = "$IP/cache"; +$wgCacheDirectory = "$IP/cache"; # Site language code, should be one of the list in ./languages/Names.php $wgLanguageCode = "en"; @@ -234,7 +230,10 @@ $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 = [ + 'http.dnsbl.sorbs.net.', + 'dnsbl-1.uceprotect.net.' +]; # Require validated email to edit $wgEmailConfirmToEdit = true; @@ -247,16 +246,38 @@ $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/' ); +$wgAllowExternalImagesFrom = [ + 'http://tile.openstreetmap.org/', + 'https://tile.openstreetmap.org', + 'http://josm.openstreetmap.de/' +]; -$wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' ); +$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; @@ -275,11 +296,104 @@ $wgSiteNotice = "<%= @mediawiki[:site_notice] %>"; $wgReadOnly = "<%= @mediawiki[:site_readonly] %>"; <% end -%> +<% if @name == "wiki.openstreetmap.org" -%> +# DE +define('NS_LANG_DE', 200); +$wgExtraNamespaces[NS_LANG_DE] = 'DE'; +$wgNamespacesWithSubpages[NS_LANG_DE] = TRUE; +$wgContentNamespaces[] = NS_LANG_DE; +define('NS_LANG_DE_TALK', 201); +$wgExtraNamespaces[NS_LANG_DE_TALK] = 'DE_talk'; +$wgNamespacesWithSubpages[NS_LANG_DE_TALK] = TRUE; + +# FR +define('NS_LANG_FR', 202); +$wgExtraNamespaces[NS_LANG_FR] = 'FR'; +$wgNamespacesWithSubpages[NS_LANG_FR] = TRUE; +$wgContentNamespaces[] = NS_LANG_FR; +define('NS_LANG_FR_TALK', 203); +$wgExtraNamespaces[NS_LANG_FR_TALK] = 'FR_talk'; +$wgNamespacesWithSubpages[NS_LANG_FR_TALK] = TRUE; + +# ES +define('NS_LANG_ES', 204); +$wgExtraNamespaces[NS_LANG_ES] = 'ES'; +$wgNamespacesWithSubpages[NS_LANG_ES] = TRUE; +$wgContentNamespaces[] = NS_LANG_ES; +define('NS_LANG_ES_TALK', 205); +$wgExtraNamespaces[NS_LANG_ES_TALK] = 'ES_talk'; +$wgNamespacesWithSubpages[NS_LANG_ES_TALK] = TRUE; + +# IT +define('NS_LANG_IT', 206); +$wgExtraNamespaces[NS_LANG_IT] = 'IT'; +$wgNamespacesWithSubpages[NS_LANG_IT] = TRUE; +$wgContentNamespaces[] = NS_LANG_IT; +define('NS_LANG_IT_TALK', 207); +$wgExtraNamespaces[NS_LANG_IT_TALK] = 'IT_talk'; +$wgNamespacesWithSubpages[NS_LANG_IT_TALK] = TRUE; + +# NL +define('NS_LANG_NL', 208); +$wgExtraNamespaces[NS_LANG_NL] = 'NL'; +$wgNamespacesWithSubpages[NS_LANG_NL] = TRUE; +$wgContentNamespaces[] = NS_LANG_NL; +define('NS_LANG_NL_TALK', 209); +$wgExtraNamespaces[NS_LANG_NL_TALK] = 'NL_talk'; +$wgNamespacesWithSubpages[NS_LANG_NL_TALK] = TRUE; + +# RU +define('NS_LANG_RU', 210); +$wgExtraNamespaces[NS_LANG_RU] = 'RU'; +$wgNamespacesWithSubpages[NS_LANG_RU] = TRUE; +$wgContentNamespaces[] = NS_LANG_RU; +define('NS_LANG_RU_TALK', 211); +$wgExtraNamespaces[NS_LANG_RU_TALK] = 'RU_talk'; +$wgNamespacesWithSubpages[NS_LANG_RU_TALK] = TRUE; + +# JA +define('NS_LANG_JA', 212); +$wgExtraNamespaces[NS_LANG_JA] = 'JA'; +$wgNamespacesWithSubpages[NS_LANG_JA] = TRUE; +$wgContentNamespaces[] = NS_LANG_JA; +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; +$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 -%> + # load extensions <% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%> <%= "require_once('#{file}');" %> <% end -%> +<% if @name == "wiki.openstreetmap.org" -%> +# wiki.openstreetmap.org specific config loaded after extensions +$wgRCWatchCategoryMembership = true; +<% end -%> + <% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%> # require user confirmation for certain actions $wgGroupPermissions['user']['move'] = false; @@ -313,3 +427,8 @@ 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 = 240;