Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187888
Change subject: Enable GlobalUserPage on test* wikis
......................................................................
Enable GlobalUserPage on test* wikis
For testing purposes, testwiki is designated as the central wiki
and test2wiki and testwikidatawiki can be used as remote wikis.
Bug: T72576
Change-Id: I661d13d5a1c16e7a8b0c50f2b87d05e43f5f98d7
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
6 files changed, 19 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/88/187888/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 78a8c19..51663e3 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -126,7 +126,7 @@
}
if ( $wmgUseGlobalUserPage && $wmgUseCentralAuth ) {
- require_once "$IP/extensions/GlobalUserPage/GlobalUserPage.php";
+ // Labs override
$wgGlobalUserPageAPIUrl =
'http://meta.wikimedia.beta.wmflabs.org/w/api.php';
$wgGlobalUserPageDBname = 'metawiki';
}
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 919e5b9..a7af488 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1324,6 +1324,12 @@
);
}
+if ( $wmgUseGlobalUserPage && $wmgUseCentralAuth ) {
+ require_once "$IP/extensions/GlobalUserPage/GlobalUserPage.php";
+ $wgGlobalUserPageAPIUrl = 'https://test.wikipedia.org/w/api.php';
+ $wgGlobalUserPageDBname = 'testwiki';
+}
+
// taking it live 2006-12-15 brion
if ( $wmgUseDismissableSiteNotice ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 636384d..06550ea 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -500,12 +500,6 @@
'default' => 'deployment-cache-upload02.eqiad.wmflabs',
),
- 'wmgUseGlobalUserPage' => array(
- 'default' => true,
- 'private' => false,
- 'fishbowl' => false,
- ),
-
'wmgUseApiFeatureUsage' => array(
'default' => true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index b5b2ff1..3861a52 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11208,6 +11208,17 @@
'labswiki' => false,
),
+// This is also guarded by $wmgUseCentralAuth.
+// Only enable on test* wikis for now
+'wmgUseGlobalUserPage' => array(
+ 'default' => false,
+ 'private' => false,
+ 'fishbowl' => false,
+ 'testwiki' => true,
+ 'test2wiki' => true,
+ 'testwikidatawiki' => true,
+),
+
'wgDisabledVariants' => array(
'default' => array(),
'zhwiki' => array( 'zh-my' ),
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index da778fd..9cad9b0 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -50,6 +50,7 @@
$IP/extensions/GlobalBlocking/GlobalBlocking.php
$IP/extensions/GlobalCssJs/GlobalCssJs.php
$IP/extensions/GlobalUsage/GlobalUsage.php
+$IP/extensions/GlobalUserPage/GlobalUserPage.php
$IP/extensions/GoogleNewsSitemap/GoogleNewsSitemap.php
$IP/extensions/Graph/Graph.php
$IP/extensions/GuidedTour/GuidedTour.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 078897e..f815111 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,3 +1,2 @@
$IP/extensions/ApiFeatureUsage/ApiFeatureUsage.php
$IP/extensions/Citoid/Citoid.php
-$IP/extensions/GlobalUserPage/GlobalUserPage.php
--
To view, visit https://gerrit.wikimedia.org/r/187888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I661d13d5a1c16e7a8b0c50f2b87d05e43f5f98d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
