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

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index f1bdeb84df8f17e685bb65e60a64bdf3520ac500..f3c127e5af2663e0d31d388c67650fa3f8c91bb9 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -281,79 +281,6 @@ $wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contribut
 $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 --git a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
index ddb87f166eb3d755f92d597498c95ee347204b6a..44485f2c3b067670c65ab6d8341c35a0374907eb 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
@@ -3,3 +3,10 @@
 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 -%>

diff --git a/cookbooks/wiki/templates/default/LocalSettings.php.erb b/cookbooks/wiki/templates/default/LocalSettings.php.erb
new file mode 100644 (file)
index 0000000..bcef00d
--- /dev/null
+++ b/cookbooks/wiki/templates/default/LocalSettings.php.erb
@@ -0,0 +1,90 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+
+# Protect against web entry
+if ( !defined( 'MEDIAWIKI' ) ) {
+       exit;
+}
+
+# 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;
+
+# 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;
+$wgNamespacesToBeSearchedDefault[NS_LANG_IT] = TRUE;
+$wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
+$wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
+$wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
+$wgNamespacesToBeSearchedDefault[NS_PROPOSAL] = TRUE;