[MediaWiki-commits] [Gerrit] Revert "Revert "Add special wikipedias to wikipedia.dblist"" - change (operations/mediawiki-config)

2015-07-29 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Revert "Add special wikipedias to wikipedia.dblist""
..


Revert "Revert "Add special wikipedias to wikipedia.dblist""

"could get weird"? We have almost all wikis in more than one dblist.

This reverts commit 3173e3b64c003be7f54dd3ccb7af4c6466e96008.

Change-Id: I729041afb3504a8fb0f73f0abd216834c4814ab5
---
M wikipedia.dblist
M wmf-config/InitialiseSettings.php
2 files changed, 19 insertions(+), 24 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia.dblist b/wikipedia.dblist
index 2b8ff21..71e58ec 100644
--- a/wikipedia.dblist
+++ b/wikipedia.dblist
@@ -7,6 +7,10 @@
 amwiki
 angwiki
 anwiki
+arbcom_dewiki
+arbcom_enwiki
+arbcom_fiwiki
+arbcom_nlwiki
 arcwiki
 arwiki
 arzwiki
@@ -245,6 +249,9 @@
 swwiki
 szlwiki
 tawiki
+tenwiki
+testwiki
+test2wiki
 tetwiki
 tewiki
 tgwiki
@@ -275,6 +282,7 @@
 vowiki
 warwiki
 wawiki
+wg_enwiki
 wowiki
 wuuwiki
 xalwiki
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1feab08..c0fc0a8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1310,10 +1310,6 @@
 
// Individual wikis
'advisorywiki' => '//advisory.wikimedia.org',
-   'arbcom_dewiki' => '//arbcom-de.wikipedia.org',
-   'arbcom_enwiki' => '//arbcom-en.wikipedia.org',
-   'arbcom_fiwiki' => '//arbcom-fi.wikipedia.org',
-   'arbcom_nlwiki' => '//arbcom-nl.wikipedia.org',
'arwikimedia' => '//ar.wikimedia.org',
'auditcomwiki' => '//auditcom.wikimedia.org',
'boardgovcomwiki' => '//boardgovcom.wikimedia.org',
@@ -1355,14 +1351,10 @@
'specieswiki' => '//species.wikimedia.org',
'stewardwiki' => '//steward.wikimedia.org',
'strategywiki' => '//strategy.wikimedia.org',
-   'tenwiki' => '//ten.wikipedia.org',
-   'testwiki' => '//test.wikipedia.org',
'testwikidatawiki' => '//test.wikidata.org',
-   'test2wiki' => '//test2.wikipedia.org',
'transitionteamwiki' => '//transitionteam.wikimedia.org',
'usabilitywiki' => '//usability.wikimedia.org',
'votewiki' => '//vote.wikimedia.org',
-   'wg_enwiki' => '//wg-en.wikipedia.org',
'wikidatawiki' => '//www.wikidata.org',
'wikimania2005wiki' => '//wikimania2005.wikimedia.org',
'wikimania2006wiki' => '//wikimania2006.wikimedia.org',
@@ -1398,10 +1390,6 @@
 
// Individual wikis
'advisorywiki' => 'https://advisory.wikimedia.org',
-   'arbcom_dewiki' => 'https://arbcom-de.wikipedia.org',
-   'arbcom_enwiki' => 'https://arbcom-en.wikipedia.org',
-   'arbcom_fiwiki' => 'https://arbcom-fi.wikipedia.org',
-   'arbcom_nlwiki' => 'https://arbcom-nl.wikipedia.org',
'arwikimedia' => 'https://ar.wikimedia.org',
'auditcomwiki' => 'https://auditcom.wikimedia.org',
'boardgovcomwiki' => 'https://boardgovcom.wikimedia.org',
@@ -1443,14 +1431,10 @@
'specieswiki' => 'https://species.wikimedia.org',
'stewardwiki' => 'https://steward.wikimedia.org',
'strategywiki' => 'https://strategy.wikimedia.org',
-   'tenwiki' => 'https://ten.wikipedia.org',
-   'testwiki' => 'https://test.wikipedia.org',
'testwikidatawiki' => 'https://test.wikidata.org',
-   'test2wiki' => 'https://test2.wikipedia.org',
'transitionteamwiki' => 'https://transitionteam.wikimedia.org',
'usabilitywiki' => 'https://usability.wikimedia.org',
'votewiki' => 'https://vote.wikimedia.org',
-   'wg_enwiki' => 'https://wg-en.wikipedia.org',
'wikidatawiki' => 'https://www.wikidata.org',
'wikimania2005wiki' => 'https://wikimania2005.wikimedia.org',
'wikimania2006wiki' => 'https://wikimania2006.wikimedia.org',
@@ -1849,8 +1833,6 @@
'tawiktionary' => 'விக்சனரி',
'tawikiquote' => 'விக்கிமேற்கோள்',
'tawikisource' => 'விக்கிமூலம்',
-   'testwiki' => 'Wikipedia',
-   'test2wiki' => 'Wikipedia',
'tewiki' => 'వికీపీడియా',
'tewikiquote' => 'వికీవ్యాఖ్య', // T89332
'tewikisource' => 'వికీసోర్స్', // T52357
@@ -2329,9 +2311,6 @@
'tawikisource' => 'விக்கிமூலம்',
'tawiktionary' => 'விக்சனரி',
'tawikiquote' => 'விக்கிமேற்கோள்',
-   'tenwiki' => 'Wikipedia',
-   'testwiki' => 'Wikipedia',
-   'test2wiki' => 'Wikipedia',
'tewiki' => 'వికీపీడియా',
'tewikiquote' => 'వికీవ్యాఖ్య', // T89332
'tewikisource' => 'వికీసోర్స్',
@@ -2378,7 +2357,6 @@
'vowiki' => 'Vükiped',
'vowikibooks' => 'Vükibuks',
'vowiktionary' => 'Vükivödabuk',
-   'wg_enwiki' => 'Wikipedia',
'wikimaniateamwiki' => 'WikimaniaTeam',
'xmfwiki' => 'ვიკიპედია',
'yiwiki' => 'װיקיפּעדיע',
@@ -14350,8 +14328,13 @@
'cawikibooks' => true, // T93637

[MediaWiki-commits] [Gerrit] Revert "Revert "Add special wikipedias to wikipedia.dblist"" - change (operations/mediawiki-config)

2015-07-29 Thread Alex Monk (Code Review)
Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/227718

Change subject: Revert "Revert "Add special wikipedias to wikipedia.dblist""
..

Revert "Revert "Add special wikipedias to wikipedia.dblist""

This reverts commit 3173e3b64c003be7f54dd3ccb7af4c6466e96008.

Change-Id: I729041afb3504a8fb0f73f0abd216834c4814ab5
---
M wikipedia.dblist
M wmf-config/InitialiseSettings.php
2 files changed, 19 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/18/227718/1

diff --git a/wikipedia.dblist b/wikipedia.dblist
index 2b8ff21..71e58ec 100644
--- a/wikipedia.dblist
+++ b/wikipedia.dblist
@@ -7,6 +7,10 @@
 amwiki
 angwiki
 anwiki
+arbcom_dewiki
+arbcom_enwiki
+arbcom_fiwiki
+arbcom_nlwiki
 arcwiki
 arwiki
 arzwiki
@@ -245,6 +249,9 @@
 swwiki
 szlwiki
 tawiki
+tenwiki
+testwiki
+test2wiki
 tetwiki
 tewiki
 tgwiki
@@ -275,6 +282,7 @@
 vowiki
 warwiki
 wawiki
+wg_enwiki
 wowiki
 wuuwiki
 xalwiki
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1feab08..c0fc0a8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1310,10 +1310,6 @@
 
// Individual wikis
'advisorywiki' => '//advisory.wikimedia.org',
-   'arbcom_dewiki' => '//arbcom-de.wikipedia.org',
-   'arbcom_enwiki' => '//arbcom-en.wikipedia.org',
-   'arbcom_fiwiki' => '//arbcom-fi.wikipedia.org',
-   'arbcom_nlwiki' => '//arbcom-nl.wikipedia.org',
'arwikimedia' => '//ar.wikimedia.org',
'auditcomwiki' => '//auditcom.wikimedia.org',
'boardgovcomwiki' => '//boardgovcom.wikimedia.org',
@@ -1355,14 +1351,10 @@
'specieswiki' => '//species.wikimedia.org',
'stewardwiki' => '//steward.wikimedia.org',
'strategywiki' => '//strategy.wikimedia.org',
-   'tenwiki' => '//ten.wikipedia.org',
-   'testwiki' => '//test.wikipedia.org',
'testwikidatawiki' => '//test.wikidata.org',
-   'test2wiki' => '//test2.wikipedia.org',
'transitionteamwiki' => '//transitionteam.wikimedia.org',
'usabilitywiki' => '//usability.wikimedia.org',
'votewiki' => '//vote.wikimedia.org',
-   'wg_enwiki' => '//wg-en.wikipedia.org',
'wikidatawiki' => '//www.wikidata.org',
'wikimania2005wiki' => '//wikimania2005.wikimedia.org',
'wikimania2006wiki' => '//wikimania2006.wikimedia.org',
@@ -1398,10 +1390,6 @@
 
// Individual wikis
'advisorywiki' => 'https://advisory.wikimedia.org',
-   'arbcom_dewiki' => 'https://arbcom-de.wikipedia.org',
-   'arbcom_enwiki' => 'https://arbcom-en.wikipedia.org',
-   'arbcom_fiwiki' => 'https://arbcom-fi.wikipedia.org',
-   'arbcom_nlwiki' => 'https://arbcom-nl.wikipedia.org',
'arwikimedia' => 'https://ar.wikimedia.org',
'auditcomwiki' => 'https://auditcom.wikimedia.org',
'boardgovcomwiki' => 'https://boardgovcom.wikimedia.org',
@@ -1443,14 +1431,10 @@
'specieswiki' => 'https://species.wikimedia.org',
'stewardwiki' => 'https://steward.wikimedia.org',
'strategywiki' => 'https://strategy.wikimedia.org',
-   'tenwiki' => 'https://ten.wikipedia.org',
-   'testwiki' => 'https://test.wikipedia.org',
'testwikidatawiki' => 'https://test.wikidata.org',
-   'test2wiki' => 'https://test2.wikipedia.org',
'transitionteamwiki' => 'https://transitionteam.wikimedia.org',
'usabilitywiki' => 'https://usability.wikimedia.org',
'votewiki' => 'https://vote.wikimedia.org',
-   'wg_enwiki' => 'https://wg-en.wikipedia.org',
'wikidatawiki' => 'https://www.wikidata.org',
'wikimania2005wiki' => 'https://wikimania2005.wikimedia.org',
'wikimania2006wiki' => 'https://wikimania2006.wikimedia.org',
@@ -1849,8 +1833,6 @@
'tawiktionary' => 'விக்சனரி',
'tawikiquote' => 'விக்கிமேற்கோள்',
'tawikisource' => 'விக்கிமூலம்',
-   'testwiki' => 'Wikipedia',
-   'test2wiki' => 'Wikipedia',
'tewiki' => 'వికీపీడియా',
'tewikiquote' => 'వికీవ్యాఖ్య', // T89332
'tewikisource' => 'వికీసోర్స్', // T52357
@@ -2329,9 +2311,6 @@
'tawikisource' => 'விக்கிமூலம்',
'tawiktionary' => 'விக்சனரி',
'tawikiquote' => 'விக்கிமேற்கோள்',
-   'tenwiki' => 'Wikipedia',
-   'testwiki' => 'Wikipedia',
-   'test2wiki' => 'Wikipedia',
'tewiki' => 'వికీపీడియా',
'tewikiquote' => 'వికీవ్యాఖ్య', // T89332
'tewikisource' => 'వికీసోర్స్',
@@ -2378,7 +2357,6 @@
'vowiki' => 'Vükiped',
'vowikibooks' => 'Vükibuks',
'vowiktionary' => 'Vükivödabuk',
-   'wg_enwiki' => 'Wikipedia',
'wikimaniateamwiki' => 'WikimaniaTeam',
'xmfwiki' => 'ვიკიპედია',
'yiwiki' => 'װיקיפּעדיע',
@@ -14350,8 +14328,13 @@
'cawikibooks' => true, // T93637
'wikivoyage' => t