wiki: Ensure custom config for wiki.osm.org is loaded

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index dff320d56a2407f49ff3083bacaf2ec3f02b0267..d67e65e56e046f14e84d5ac94c125e67f7eca2de 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -275,6 +275,94 @@ $wgSiteNotice = "<%= @mediawiki[:site_notice] %>";
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>
 
 $wgReadOnly = "<%= @mediawiki[:site_readonly] %>";
 <% end -%>
 

+<% if @mediawiki[:site] == "wiki.openstreetmap.org" -%>
+# 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;
+
+# defines which links of the sidebar are translatable
+$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' );
+<% end -%>
+

 # load extensions
 <% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%>
 <%= "require_once('#{file}');" %>
 # load extensions
 <% Dir.glob("#{@directory}/LocalSettings.d/*.php") do |file| -%>
 <%= "require_once('#{file}');" %>

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 44485f2c3b067670c65ab6d8341c35a0374907eb..56412467e6a001465239de65455bbbc71f45d944 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-CirrusSearch.inc.php.erb
@@ -4,7 +4,7 @@ wfLoadExtension( 'CirrusSearch' );
 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';
 
 $wgDisableSearchUpdate = false;
 $wgSearchType = 'CirrusSearch';
 

-<% if @mediawiki[:site] === "wiki.openstreetmap.org" %>
+<% 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
 # 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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index b99e9c3b5dc104d52fccafd550e7d7b108c11540..ef0d16b8b67d79330da40cea7e23d919595ca55b 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -60,13 +60,6 @@ mediawiki_site "wiki.openstreetmap.org" do
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
   # 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
 mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end


@@ -141,13 +134,6 @@ directory "/srv/wiki.openstreetmap.org/dump" do
   mode "0775"
 end
 
   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"
 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
deleted file mode 100644 (file)
index 190b407..0000000
--- a/cookbooks/wiki/templates/default/after_extensions.php.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-# DO NOT EDIT - This file is being maintained by Chef
-
-# Protect against web entry
-if ( !defined( 'MEDIAWIKI' ) ) {
-       exit;
-}
-
-# configuration loaded after the extensions
-
-# user group "confirmed" with identical rights as "autoconfirmed", but assigned manually by sysops
-$wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed'];
-$wgAddGroups['sysop'][] = 'confirmed';
-$wgRemoveGroups['sysop'][] = 'confirmed';

diff --git a/cookbooks/wiki/templates/default/before_extensions.php.erb b/cookbooks/wiki/templates/default/before_extensions.php.erb
deleted file mode 100644 (file)
index 6159c9a..0000000
--- a/cookbooks/wiki/templates/default/before_extensions.php.erb
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-# DO NOT EDIT - This file is being maintained by Chef
-
-# Protect against web entry
-if ( !defined( 'MEDIAWIKI' ) ) {
-       exit;
-}
-
-# configuration loaded before the extensions
-
-# 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;
-
-# defines which links of the sidebar are translatable 
-$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' );