From: Grant Slater Date: Tue, 2 Aug 2022 20:42:54 +0000 (+0300) Subject: Merge remote-tracking branch 'tigerfell/pr257' X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b?hp=1ebe519fb753057e4fcc2a02401cc6d2c20cee14 Merge remote-tracking branch 'tigerfell/pr257' --- diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb index a25c60377..dff320d56 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -258,87 +258,10 @@ $wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://t $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' ); -# FIXME - move to specific -# 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 --git a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb index ddb87f166..44485f2c3 100644 --- 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/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index ef0d16b8b..b99e9c3b5 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -60,6 +60,13 @@ mediawiki_site "wiki.openstreetmap.org" do # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." end +template "/srv/wiki.openstreetmap.org/00_before_extensions.php" do + source "before_extensions.php.erb" + owner node[:mediawiki][:user] + group node[:mediawiki][:group] + mode "600" +end + mediawiki_extension "CodeEditor" do site "wiki.openstreetmap.org" end @@ -134,6 +141,13 @@ directory "/srv/wiki.openstreetmap.org/dump" do mode "0775" end +template "/srv/wiki.openstreetmap.org/99_after_extensions.php" do + source "after_extensions.php.erb" + owner node[:mediawiki][:user] + group node[:mediawiki][:group] + mode "600" +end + cron_d "wiki-dump" do minute "0" hour "2" diff --git a/cookbooks/wiki/templates/default/after_extensions.php.erb b/cookbooks/wiki/templates/default/after_extensions.php.erb new file mode 100644 index 000000000..190b40772 --- /dev/null +++ b/cookbooks/wiki/templates/default/after_extensions.php.erb @@ -0,0 +1,14 @@ +