From: Tigerfell <tigerfell-688@tuta.io>
Date: Tue, 9 Mar 2021 18:29:53 +0000 (+0100)
Subject: Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d

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

ab47927c016597f8602b81dcdc168ad5c335389d
diff --cc cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
index ddb87f166,7f69d41bb..44485f2c3
--- a/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 -%>