jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated wgConf->localVHosts with wgLocalVirtualHosts
......................................................................
Replace deprecated wgConf->localVHosts with wgLocalVirtualHosts
Deprecated since October last year: I25204d37
Bug: T106206
Change-Id: Ie3fefa1931b00110bdb03ce9aa76b1c51a5b9b0a
---
D docroot/noc/conf/wgConfVHosts-labs.php.txt
D docroot/noc/conf/wgConfVHosts.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/wgConf.php
D wmf-config/wgConfVHosts-labs.php
D wmf-config/wgConfVHosts.php
8 files changed, 29 insertions(+), 42 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/wgConfVHosts-labs.php.txt
b/docroot/noc/conf/wgConfVHosts-labs.php.txt
deleted file mode 120000
index 9c64fc2..0000000
--- a/docroot/noc/conf/wgConfVHosts-labs.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/wgConfVHosts-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/wgConfVHosts.php.txt
b/docroot/noc/conf/wgConfVHosts.php.txt
deleted file mode 120000
index 077f536..0000000
--- a/docroot/noc/conf/wgConfVHosts.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/wgConfVHosts.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 9012404..62ad71c 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -35,8 +35,6 @@
proofreadpage.php
throttle.php
wgConf.php
- wgConfVHosts.php
- wgConfVHosts-labs.php
squid.php
squid-labs.php
session.php
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 4d5960d..38aeedf 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -43,6 +43,19 @@
$wgEventLoggingFile =
'udp://deployment-eventlogging03.eqiad.wmflabs:8421/EventLogging';
}
+$wgLocalVirtualHosts = array(
+ 'wikipedia.beta.wmflabs.org',
+ 'wiktionary.beta.wmflabs.org',
+ 'wikibooks.beta.wmflabs.org',
+ 'wikiquote.beta.wmflabs.org',
+ 'wikinews.beta.wmflabs.org',
+ 'wikisource.beta.wmflabs.org',
+ 'wikiversity.beta.wmflabs.org',
+ 'wikivoyage.beta.wmflabs.org',
+ 'meta.wikimedia.beta.wmflabs.org',
+ 'commons.wikimedia.beta.wmflabs.org',
+);
+
if ( $wmfUseArticleCreationWorkflow ) {
require_once
"$IP/extensions/ArticleCreationWorkflow/ArticleCreationWorkflow.php";
$wgArticleCreationBucketConfig['buckets']['off'] = 0;
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1bab1c5..f5c90d7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -103,6 +103,21 @@
require( "$wmfConfigDir/InitialiseSettings.php" );
}
+$wgLocalVirtualHosts = array(
+ 'wikipedia.org',
+ 'wiktionary.org',
+ 'wikiquote.org',
+ 'wikibooks.org',
+ 'wikiquote.org',
+ 'wikinews.org',
+ 'wikisource.org',
+ 'wikiversity.org',
+ 'wikivoyage.org',
+ // 'wikimedia.org' // Removed 2008-09-30 by brion -- breaks
codereview-proxy.wikimedia.org
+ 'meta.wikimedia.org', // Presumably needed to load meta spam list. Any
others?
+ 'commons.wikimedia.org',
+);
+
# Is this database listed in dblist?
# Note: $wgLocalDatabases set in wgConf.php.
# Note: must be done before calling $multiVersion functions other than
getDatabase().
diff --git a/wmf-config/wgConf.php b/wmf-config/wgConf.php
index 6db983c..a8dad48 100644
--- a/wmf-config/wgConf.php
+++ b/wmf-config/wgConf.php
@@ -20,14 +20,7 @@
'wikivoyage',
);
-if ( $wmfRealm === 'labs' ) {
- $wgConf->localVHosts = require( "{$wmfConfigDir}/wgConfVHosts-labs.php"
);
- $dbList = 'all-labs';
-} else {
- $wgConf->localVHosts = require( "{$wmfConfigDir}/wgConfVHosts.php" );
- $dbList = 'all';
-}
-
+$dbList = $wmfRealm === 'labs' ? 'all-labs' : 'all';
$wgConf->wikis = MWWikiversions::readDbListFile( $dbList );
$wgConf->fullLoadCallback = 'wmfLoadInitialiseSettings';
diff --git a/wmf-config/wgConfVHosts-labs.php b/wmf-config/wgConfVHosts-labs.php
deleted file mode 100644
index 978218c..0000000
--- a/wmf-config/wgConfVHosts-labs.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-return array(
- 'wikipedia.beta.wmflabs.org',
- 'wiktionary.beta.wmflabs.org',
- 'wikibooks.beta.wmflabs.org',
- 'wikiquote.beta.wmflabs.org',
- 'wikinews.beta.wmflabs.org',
- 'wikisource.beta.wmflabs.org',
- 'wikiversity.beta.wmflabs.org',
- 'wikivoyage.beta.wmflabs.org',
- 'meta.wikimedia.beta.wmflabs.org',
- 'commons.wikimedia.beta.wmflabs.org',
-);
diff --git a/wmf-config/wgConfVHosts.php b/wmf-config/wgConfVHosts.php
deleted file mode 100644
index 557d73e..0000000
--- a/wmf-config/wgConfVHosts.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-return array(
- 'wikipedia.org',
- 'wiktionary.org',
- 'wikiquote.org',
- 'wikibooks.org',
- 'wikiquote.org',
- 'wikinews.org',
- 'wikisource.org',
- 'wikiversity.org',
- 'wikivoyage.org',
- // 'wikimedia.org' // Removed 2008-09-30 by brion -- breaks
codereview-proxy.wikimedia.org
- 'meta.wikimedia.org', // Presumably needed to load meta spam list. Any
others?
- 'commons.wikimedia.org',
-);
-
--
To view, visit https://gerrit.wikimedia.org/r/226971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3fefa1931b00110bdb03ce9aa76b1c51a5b9b0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
