jenkins-bot has submitted this change and it was merged.
Change subject: Move VHosts config from wgConf to seperate files
......................................................................
Move VHosts config from wgConf to seperate files
Change-Id: I35e791e991e4aabf91e90975e951f029b4f6eb65
---
A docroot/noc/conf/wgConfVHosts-labs.php.txt
A docroot/noc/conf/wgConfVHosts.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/wgConf.php
A wmf-config/wgConfVHosts-labs.php
A wmf-config/wgConfVHosts.php
6 files changed, 36 insertions(+), 37 deletions(-)
Approvals:
Reedy: 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
new file mode 120000
index 0000000..9c64fc2
--- /dev/null
+++ b/docroot/noc/conf/wgConfVHosts-labs.php.txt
@@ -0,0 +1 @@
+../../../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
new file mode 120000
index 0000000..077f536
--- /dev/null
+++ b/docroot/noc/conf/wgConfVHosts.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/wgConfVHosts.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index b943885..b136ac0 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -40,6 +40,8 @@
wmf-config/proofreadpage.php
wmf-config/throttle.php
wmf-config/wgConf.php
+ wmf-config/wgConfVHosts.php
+ wmf-config/wgConfVHosts-labs.php
wmf-config/squid.php
wmf-config/squid-labs.php
wmf-config/session.php
diff --git a/wmf-config/wgConf.php b/wmf-config/wgConf.php
index 0490f8f..dd2e29a 100644
--- a/wmf-config/wgConf.php
+++ b/wmf-config/wgConf.php
@@ -20,43 +20,7 @@
'wikivoyage',
);
-switch( $wmfRealm ) {
- case 'production':
- $wgConf->localVHosts = 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',
- );
- break;
-
- case 'labs':
- $wgConf->localVHosts = 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',
- // 'wikimedia.beta.wmflabs.org' // Removed 2008-09-30
by brion -- breaks codereview-proxy.wikimedia.org
- 'meta.wikimedia.beta.wmflabs.org', // Presumably needed
to load meta spam list. Any others?
- 'incubator.wikimedia.beta.wmflabs.org',
- 'commons.wikimedia.beta.wmflabs.org',
- );
- break;
-
- default:
-}
+$wgConf->localVHosts = require( getRealmSpecificFilename(
"$wmfConfigDir/wgConfVHosts.php" ) );
$wgConf->wikis = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../all.dblist" ) ) );
diff --git a/wmf-config/wgConfVHosts-labs.php b/wmf-config/wgConfVHosts-labs.php
new file mode 100644
index 0000000..0239aa4
--- /dev/null
+++ b/wmf-config/wgConfVHosts-labs.php
@@ -0,0 +1,14 @@
+<?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',
+ 'incubator.wikimedia.beta.wmflabs.org',
+ 'commons.wikimedia.beta.wmflabs.org',
+);
diff --git a/wmf-config/wgConfVHosts.php b/wmf-config/wgConfVHosts.php
new file mode 100644
index 0000000..557d73e
--- /dev/null
+++ b/wmf-config/wgConfVHosts.php
@@ -0,0 +1,17 @@
+<?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/64229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35e791e991e4aabf91e90975e951f029b4f6eb65
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[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
