Andrew Bogott has submitted this change and it was merged.
Change subject: Rename labswiki to deploymentwiki
......................................................................
Rename labswiki to deploymentwiki
bug: 70108
Change-Id: I2cc66980c78cb0a1dc17d45ce72ad4bda9688cad
---
M all-labs.dblist
M multiversion/MWMultiVersion.php
M tests/multiversion/MWMultiVersionTest.php
M wikiversions-labs.json
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
7 files changed, 12 insertions(+), 17 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Andrew Bogott: Looks good to me, approved
diff --git a/all-labs.dblist b/all-labs.dblist
index 58f7160..a9aae24 100644
--- a/all-labs.dblist
+++ b/all-labs.dblist
@@ -2,6 +2,7 @@
arwiki
cawiki
commonswiki
+deploymentwiki
dewiki
ee_prototypewiki
en_rtlwiki
@@ -19,7 +20,6 @@
hiwiki
jawiki
kowiki
-labswiki
loginwiki
metawiki
ruwiki
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index bf3e233..27a3392 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -141,9 +141,6 @@
'www.mediawiki.org' => 'mediawiki',
'www.wikidata.org' => 'wikidata',
'wikisource.org' => 'sources',
-
- // Labs
- 'deployment.wikimedia.beta.wmflabs.org' => 'labs',
);
$site = "wikipedia";
diff --git a/tests/multiversion/MWMultiVersionTest.php
b/tests/multiversion/MWMultiVersionTest.php
index c791a45..81aae25 100644
--- a/tests/multiversion/MWMultiVersionTest.php
+++ b/tests/multiversion/MWMultiVersionTest.php
@@ -124,7 +124,7 @@
array( 'aawiki', 'aa.wikipedia.beta.wmflabs.org' ),
array( 'arwiki', 'ar.wikipedia.beta.wmflabs.org' ),
array( 'commonswiki',
'commons.wikimedia.beta.wmflabs.org' ),
- array( 'labswiki',
'deployment.wikimedia.beta.wmflabs.org' ),
+ array( 'deploymentwiki',
'deployment.wikimedia.beta.wmflabs.org' ),
array( 'dewiki', 'de.wikipedia.beta.wmflabs.org' ),
array( 'dewikivoyage', 'de.wikivoyage.beta.wmflabs.org'
),
@@ -140,8 +140,6 @@
array( 'eowiki', 'eo.wikipedia.beta.wmflabs.org' ),
array( 'hewiki', 'he.wikipedia.beta.wmflabs.org' ),
-
- array( 'labswiki',
'deployment.wikimedia.beta.wmflabs.org' ),
array( 'loginwiki', 'login.wikimedia.beta.wmflabs.org'
),
array( 'metawiki', 'meta.wikimedia.beta.wmflabs.org' ),
diff --git a/wikiversions-labs.json b/wikiversions-labs.json
index 0660c77..4845292 100644
--- a/wikiversions-labs.json
+++ b/wikiversions-labs.json
@@ -3,6 +3,7 @@
"arwiki": "php-master",
"cawiki": "php-master",
"commonswiki": "php-master",
+ "deploymentwiki": "php-master",
"dewiki": "php-master",
"ee_prototypewiki": "php-master",
"en_rtlwiki": "php-master",
@@ -20,7 +21,6 @@
"hiwiki": "php-master",
"jawiki": "php-master",
"kowiki": "php-master",
- "labswiki": "php-master",
"loginwiki": "php-master",
"metawiki": "php-master",
"ruwiki": "php-master",
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 1487538..b47ae0b 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -57,7 +57,7 @@
}
if ( $wmgUseOAuth ) {
- $wgMWOAuthCentralWiki = 'labswiki'; # bug 57403
+ $wgMWOAuthCentralWiki = 'deploymentwiki'; # bug 57403
// Bug 59141 - Return this to true and reset secrets once SSL works in
labs
$wgMWOAuthSecureTokenTransfer = false;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a875f1a..06ee65b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1235,7 +1235,7 @@
'.wikinews.beta.wmflabs.org' => 'enwikinews',
'.wiktionary.beta.wmflabs.org' => 'enwiktionary',
'meta.wikimedia.beta.wmflabs.org' => 'metawiki',
- 'deployment.wikimedia.beta.wmflabs.org' => 'labswiki',
+ 'deployment.wikimedia.beta.wmflabs.org' =>
'deploymentwiki',
'test.wikimedia.beta.wmflabs.org' => 'testwiki',
'commons.wikimedia.beta.wmflabs.org' => 'commonswiki',
$wmfHostnames['wikidata'] => 'wikidatawiki',
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 9ec058d..c06b7b0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -56,7 +56,7 @@
),
'wgSitename' => array(
- 'labswiki' => 'Deployment',
+ 'deploymentwiki' => 'Deployment',
'ee_prototypewiki' => 'Editor Engagement Prototype',
'wikivoyage' => 'Wikivoyage',
),
@@ -74,8 +74,8 @@
'wikivoyage' => '//$lang.wikivoyage.$variant.wmflabs.org',
'commonswiki' => '//commons.wikimedia.$variant.wmflabs.org',
+ 'deploymentwiki' =>
'//deployment.wikimedia.$variant.wmflabs.org',
'ee_prototypewiki' =>
'//ee-prototype.wikipedia.$variant.wmflabs.org',
- 'labswiki' =>
'//deployment.wikimedia.$variant.wmflabs.org',
'loginwiki' => '//login.wikimedia.$variant.wmflabs.org',
'metawiki' => '//meta.wikimedia.$variant.wmflabs.org',
'testwiki' => '//test.wikimedia.$variant.wmflabs.org',
@@ -98,7 +98,7 @@
'metawiki' => 'http://meta.wikimedia.$variant.wmflabs.org',
'ee_prototypewiki' =>
'http://ee-prototype.wikipedia.$variant.wmflabs.org',
'commonswiki' =>
'http://commons.wikimedia.$variant.wmflabs.org',
- 'labswiki' =>
'http://deployment.wikimedia.$variant.wmflabs.org',
+ 'deploymentwiki' =>
'http://deployment.wikimedia.$variant.wmflabs.org',
'loginwiki' =>
'http://login.wikimedia.$variant.wmflabs.org',
'testwiki' => 'http://test.wikimedia.$variant.wmflabs.org',
'wikidatawiki' => 'http://wikidata.$variant.wmflabs.org',
@@ -143,7 +143,7 @@
),
'wmgNoticeProject' => array(
- 'labswiki' => 'meta',
+ 'deploymentwiki' => 'meta',
),
//'-wgDebugLogGroups' => array(),
@@ -204,10 +204,10 @@
'default' => false,
),
- # To help fight spam, makes rules maintained on labswiki
+ # To help fight spam, makes rules maintained on deploymentwiki
# to be available on all beta wikis.
'-wmgAbuseFilterCentralDB' => array(
- 'default' => 'labswiki',
+ 'default' => 'deploymentwiki',
),
'-wmgUseGlobalAbuseFilters' => array(
'default' => true,
@@ -253,7 +253,7 @@
'wmgULSPosition' => array(
# Beta-specific
'ee-prototype' => 'personal',
- 'labswiki' => 'personal',
+ 'deploymentwiki' => 'personal',
),
// (bug 39653) The plan is to enable it for testing on labs first, so
add
--
To view, visit https://gerrit.wikimedia.org/r/156695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cc66980c78cb0a1dc17d45ce72ad4bda9688cad
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
