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

diff --cc cookbooks/mediawiki/templates/default/LocalSettings.php.erb
Simple merge

diff --cc 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 -%>