Ori.livneh has submitted this change and it was merged.
Change subject: beta: correct wgCanonicalServer string format
......................................................................
beta: correct wgCanonicalServer string format
'$cluster' => '$channel'.
Corrects a mistake introduced in I697f7e4a6.
Bug: 63756
Change-Id: I9c440d6564a83c98b509e0ee19707ae5907cd772
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d289340..63d71a2 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1228,7 +1228,6 @@
$wmgSecondLevelDomainRegex = '/^\w+\.\w+\.\w+\.\w+\./';
$wgCentralAuthAutoLoginWikis = array(
'.wikipedia.beta.wmflabs.org' => 'enwiki',
- '.wikipedia.beta-hhvm.wmflabs.org' => 'enwiki',
'.wikisource.beta.wmflabs.org' => 'enwikisource',
'.wikibooks.beta.wmflabs.org' => 'enwikibooks',
'.wikiversity.beta.wmflabs.org' => 'enwikiversity',
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 6aa33c3..e29c22c 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -74,7 +74,7 @@
),
'wgCanonicalServer' => array(
- 'default' => 'http://$lang.wikipedia.$cluster.wmflabs.org',
+ 'default' => 'http://$lang.wikipedia.$channel.wmflabs.org',
'wikipedia' =>
'http://$lang.wikipedia.$channel.wmflabs.org',
'wikibooks' => 'http://$lang.wikibooks.beta.wmflabs.org',
'wikiquote' => 'http://$lang.wikiquote.beta.wmflabs.org',
--
To view, visit https://gerrit.wikimedia.org/r/125070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c440d6564a83c98b509e0ee19707ae5907cd772
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
