Restore elasticsearch6.x and get rid of elasticsearch5.x

[chef.git] / cookbooks / mediawiki / templates / default / mw-ext-CirrusSearch.inc.php.erb

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
index 87c817c58a184192b10faf67dec659930b7b1f58..8a6ef31ca4eac83916cfade6871647b580ad94f7 100644 (file)
--- 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,10 @@
 <?php
 # DO NOT EDIT - This file is being maintained by Chef
 <?php
 # DO NOT EDIT - This file is being maintained by Chef

-require_once( $IP.'/extensions/CirrusSearch/CirrusSearch.php' );
+wfLoadExtension( 'CirrusSearch' );

 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';
 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';

+
+# 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 ));