X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/03b5f3ea1de0f4490857a894b407bf4f314a5d2c..0a6824a8973356e876bbe7c3c85fe928e6ca70ae:/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 ee14cdcd3..d67e65e56 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -46,6 +46,7 @@ $wgEnableUserEmail = true; # UPO $wgEmergencyContact = "<%= @mediawiki[:email_contact] %>"; $wgPasswordSender = "<%= @mediawiki[:email_sender] %>"; $wgPasswordSenderName = "<%= @mediawiki[:email_sender_name] %>"; //Replaced by MediaWiki:Emailsender in v1.23.0 +$wgNoReplyAddress = "<%= @mediawiki[:email_sender] %>"; $wgEnotifUserTalk = true; # UPO $wgEnotifWatchlist = true; # UPO @@ -88,13 +89,13 @@ $wgMaxShellTime = 360; $wgMaxShellWallClockTime = 360; # Allow some more upload extensions -$wgFileExtensions[] = 'doc'; $wgFileExtensions[] = 'pdf'; $wgFileExtensions[] = 'odt'; $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,11 +112,20 @@ $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; +# 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 @@ -141,7 +151,7 @@ $wgLanguageCode = "en"; $wgPageLanguageUseDB = true; $wgGroupPermissions['user']['pagelang'] = true; -$wgSecretKey = '<%= @node[:mediawiki][:sites][@name][:wgSecretKey] %>'; +$wgSecretKey = '<%= @secret_key %>'; # Site upgrade key. Must be set to a string (default provided) to turn on the # web installer while LocalSettings.php is in place @@ -176,16 +186,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; @@ -193,13 +193,29 @@ $wgGroupPermissions['bureaucrat']['deleterevision'] = true; $wgGroupPermissions['bureaucrat']['suppressrevision'] = true; $wgGroupPermissions['bureaucrat']['suppressionlog'] = true; +# Since 1.32 MW introduced interface-admin group to separate all UI-related rights. This makes sense for bigger sites, +# but for OSM it makes more sense to keep group structure simple. Give all interface-admin rights to sysops. +# Also remove the interface-admin group to avoid confusion. +$wgGroupPermissions['sysop'] = array_merge( $wgGroupPermissions['sysop'], $wgGroupPermissions['interface-admin'] ); +unset( $wgGroupPermissions['interface-admin'] ); +unset( $wgRevokePermissions['interface-admin'] ); +unset( $wgAddGroups['interface-admin'] ); +unset( $wgRemoveGroups['interface-admin'] ); +unset( $wgGroupsAddToSelf['interface-admin'] ); +unset( $wgGroupsRemoveFromSelf['interface-admin'] ); + +# The v1.32+ gadget system also requires two additional rights +# See https://www.mediawiki.org/wiki/Extension:Gadgets +$wgGroupPermissions['sysop']['gadgets-edit'] = true; +$wgGroupPermissions['sysop']['gadgets-definition-edit'] = true; + <% if @mediawiki[:private_accounts] -%> # Prevent new user registrations except by existing users $wgGroupPermissions['*']['createaccount'] = false; $wgGroupPermissions['user']['createaccount'] = true; <% end -%> -<% if @mediawiki[:private_site] -%> +<% if @mediawiki[:private_site] -%> # Disable reading by anonymous users $wgGroupPermissions['*']['read'] = false; @@ -209,17 +225,6 @@ $wgWhitelistRead = array ("Special:Userlogin"); # Prevent new user registrations except by sysops $wgGroupPermissions['*']['createaccount'] = false; -# Since 1.32 MW introduced interface-admin group to separate all UI-related rights. This makes sense for bigger sites, -# but for OSM it makes more sense to keep group structure simple. Give all interface-admin rights to sysops. -# Also remove the interface-admin group to avoid confusion. -$wgGroupPermissions['sysop'] = array_merge( $wgGroupPermissions['sysop'], $wgGroupPermissions['interface-admin'] ); -unset( $wgGroupPermissions['interface-admin'] ); -unset( $wgRevokePermissions['interface-admin'] ); -unset( $wgAddGroups['interface-admin'] ); -unset( $wgRemoveGroups['interface-admin'] ); -unset( $wgGroupsAddToSelf['interface-admin'] ); -unset( $wgGroupsRemoveFromSelf['interface-admin'] ); - # Restrict access to the upload directory $wgUploadPath = "$wgScriptPath/img_auth.php"; <% end -%> @@ -229,7 +234,7 @@ $wgNamespacesWithSubpages[NS_MAIN] = true; # DNS Blacklists to use $wgEnableDnsBlacklist = true; -$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.', 'dnsbl-3.uceprotect.net.' ); +$wgDnsBlacklistUrls = array( 'proxies.dnsbl.sorbs.net.', 'opm.tornevall.org.', 'xbl.spamhaus.org.', 'dnsbl-2.uceprotect.net.' ); # Require validated email to edit $wgEmailConfirmToEdit = true; @@ -237,13 +242,6 @@ $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; - # Disable Hit Counter for Performance $wgDisableCounters = TRUE; # Disable IP in Header to avoid cache issue @@ -260,14 +258,24 @@ $wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://t $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' ); -# FIXME - move to specific -$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'portal-url', 'mapfeatures-url', 'helppage' ); - # 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 @mediawiki[:site] == "wiki.openstreetmap.org" -%> # DE define('NS_LANG_DE', 200); $wgExtraNamespaces[NS_LANG_DE] = 'DE'; @@ -331,6 +339,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; @@ -338,21 +357,47 @@ $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 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; -<% if @mediawiki[:site_notice] -%> -$wgSiteNotice = "<%= @mediawiki[:site_notice] %>"; -<% end -%> -<% if @mediawiki[:site_readonly] -%> -$wgReadOnly = "<%= @mediawiki[:site_readonly] %>"; +# 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 -%>