jenkins-bot has submitted this change and it was merged.
Change subject: beta: configuration for Wikidata
......................................................................
beta: configuration for Wikidata
bug: 47827
Change-Id: I7ae71e3b1a2a3115c4e704134b0e3c4130d71876
---
M all-labs.dblist
M wikiversions-labs.dat
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/db-labs.php
5 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/all-labs.dblist b/all-labs.dblist
index 4fc6ae5..110e86f 100644
--- a/all-labs.dblist
+++ b/all-labs.dblist
@@ -18,3 +18,4 @@
simplewiki
sqwiki
testwiki
+wikidatawiki
diff --git a/wikiversions-labs.dat b/wikiversions-labs.dat
index 3cb3840..9a07c12 100644
--- a/wikiversions-labs.dat
+++ b/wikiversions-labs.dat
@@ -18,3 +18,4 @@
simplewiki php-master
sqwiki php-master
testwiki php-master
+wikidatawiki php-master
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0847ab2..2e2869e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -103,13 +103,15 @@
$wmfHostnames = array();
switch( $wmfRealm ) {
case 'labs':
- $wmfHostnames['meta'] = 'meta.wikimedia.beta.wmflabs.org';
- $wmfHostnames['upload'] = 'upload.beta.wmflabs.org';
+ $wmfHostnames['meta'] = 'meta.wikimedia.beta.wmflabs.org';
+ $wmfHostnames['upload'] = 'upload.beta.wmflabs.org';
+ $wmfHostnames['wikidata'] = 'wikidata.beta.wmflabs.org';
break;
case 'production':
default:
$wmfHostnames['meta'] = 'meta.wikimedia.org';
$wmfHostnames['upload'] = 'upload.wikimedia.org';
+ $wmfHostnames['wikidata'] = 'www.wikidata.org';
break;
}
@@ -1223,6 +1225,7 @@
'deployment.wikimedia.beta.wmflabs.org' => 'labswiki',
'test.wikimedia.beta.wmflabs.org' => 'testwiki',
'commons.wikimedia.beta.wmflabs.org' => 'commonswiki',
+ $wmfHostnames['wikidata'] => 'wikidatawiki',
'ee-prototype.wikipedia.beta.wmflabs.org' =>
'ee_prototypewiki',
);
$wgCentralAuthLoginWiki = false;
@@ -2471,7 +2474,7 @@
// to be safe, keeping this here although $wgDBname is default setting
$wgWBSettings['siteGlobalID'] = $wgDBname;
- $wgWBSettings['repoUrl'] = '//www.wikidata.org';
+ $wgWBSettings['repoUrl'] = "//{$wmfHostnames['wikidata']}";
$wgWBSettings['repoNamespaces'] = array(
'wikibase-item' => '',
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 8295526..56df961 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -229,12 +229,6 @@
'default' => false,
),
- # Completely disable wikidata on the beta cluster
- # There is no configuration for it yet
- '-wmgUseWikibaseClient' => array(
- 'default' => false,
- ),
-
'wmgEnableGeoData' => array(
'default' => true,
),
diff --git a/wmf-config/db-labs.php b/wmf-config/db-labs.php
index deba8bb..3eec32d 100644
--- a/wmf-config/db-labs.php
+++ b/wmf-config/db-labs.php
@@ -21,6 +21,8 @@
'frwikivoyage' => 's2',
'nlwikivoyage' => 's2',
'ruwikivoyage' => 's2',
+
+ 'wikidatawiki' => 's2',
),
'sectionLoads' => array(
--
To view, visit https://gerrit.wikimedia.org/r/61428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ae71e3b1a2a3115c4e704134b0e3c4130d71876
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Hydriz <[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
