Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

diff --combined cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index f1bdeb84df8f17e685bb65e60a64bdf3520ac500,ac9625580a1e5998bdefacf4b081195d07a5443d..f3c127e5af2663e0d31d388c67650fa3f8c91bb9
--- 1/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
--- 2/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@@ -46,7 -46,6 +46,7 @@@ $wgEnableUserEmail  = true; # UP
  $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
@@@ -142,7 -141,7 +142,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
@@@ -230,19 -229,12 +230,19 @@@ $wgGroupPermissions['*']['createaccount
  $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-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;
@@@ -274,86 -266,12 +274,13 @@@ $wgAllowExternalImagesFrom = array( 'ht
  $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' );
 +# defines which links of the sidebar are translatable 
 +$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' );
  
  # FIXME - move to specific
  $wgAllowUserJs = TRUE;
  $wgAllowUserCss = TRUE;
  
- # FIXME - move to specific
- # 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;
- 
- $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;
- 
- 
  # 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

diff --combined cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
index ddb87f166eb3d755f92d597498c95ee347204b6a,7f69d41bb2fb93d41d6dec92cefee8c29b7a7f14..44485f2c3b067670c65ab6d8341c35a0374907eb
--- 1/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
--- 2/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
@@@ -1,5 -1,12 +1,12 @@@
  <?php
  # DO NOT EDIT - This file is being maintained by Chef
 -require_once($IP .'/extensions/CirrusSearch/CirrusSearch.php');
 +wfLoadExtension( 'CirrusSearch' );
  $wgDisableSearchUpdate = false;
  $wgSearchType = 'CirrusSearch';
+ 
+ <% if @mediawiki[:site] === "wiki.openstreetmap.org" %>
+ # setting the search weight of the main wiki's proposal namespace lower then general talk pages (0.2), but
+ # higher then wiki project namespace (0.1)
+ # Documentation at https://phabricator.wikimedia.org/source/extension-cirrussearch/browse/master/docs/settings.txt$693
+ $wgCirrusSearchNamespaceWeights = array_merge ( $wgCirrusSearchNamespaceWeights, array ( NS_PROPOSAL => 0.15 ));
+ <% end -%>