Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63839
Change subject: Refactor out session code
......................................................................
Refactor out session code
Change-Id: Id31586a4ffcb1bf036fbbe93837d709fdaab2cee
---
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
A wmf-config/session-labs.php
A wmf-config/session.php
4 files changed, 53 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/39/63839/1
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index f49f1c5..e1cdc91 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -42,6 +42,8 @@
wmf-config/wgConf.php
wmf-config/squid.php
wmf-config/squid-labs.php
+ wmf-config/session.php
+ wmf-config/session-labs
)
# Create non-txt symlink from mediawiki-config
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5547e4c..7f0513d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -366,56 +366,7 @@
)
);
-$sessionRedis = array(
- 'pmtpa' => array(
- '10.0.12.1', # mc1
- '10.0.12.2', # mc2
- '10.0.12.3', # mc3
- '10.0.12.4', # mc4
- '10.0.12.5', # mc5
- '10.0.12.6', # mc6
- '10.0.12.7', # mc7
- '10.0.12.8', # mc8
- '10.0.12.9', # mc9
- '10.0.12.10', # mc10
- '10.0.12.11', # mc11
- '10.0.12.12', # mc12
- '10.0.12.13', # mc13
- '10.0.12.14', # mc14
- '10.0.12.15', # mc15
- '10.0.12.16', # mc16
- ),
- 'eqiad' => array(
- '10.64.0.180', # mc1001
- '10.64.0.181', # mc1002
- '10.64.0.182', # mc1003
- '10.64.0.183', # mc1004
- '10.64.0.184', # mc1005
- '10.64.0.185', # mc1006
- '10.64.0.186', # mc1007
- '10.64.0.187', # mc1008
- '10.64.0.188', # mc1009
- '10.64.0.189', # mc1010
- '10.64.0.190', # mc1011
- '10.64.0.191', # mc1012
- '10.64.0.192', # mc1013
- '10.64.0.193', # mc1014
- '10.64.0.194', # mc1015
- '10.64.0.195', # mc1016
- ),
-);
-
-// Cache to hold user sessions in production:
-$wgObjectCaches['sessions'] = array(
- 'class' => 'RedisBagOStuff',
- 'servers' => $sessionRedis[$wmfDatacenter],
- 'password' => $wmgRedisPassword,
-);
-
-// Override for beta:
-if( $wmfRealm == 'labs' ) {
- $wgObjectCaches['sessions'] = $wgObjectCaches['memcached-pecl'];
-}
+require( getRealmSpecificFilename( "$wmfConfigDir/session.php" ) );
// Use the cache setup above and configure sessions caching
$wgSessionCacheType = 'sessions';
diff --git a/wmf-config/session-labs.php b/wmf-config/session-labs.php
new file mode 100644
index 0000000..623924a
--- /dev/null
+++ b/wmf-config/session-labs.php
@@ -0,0 +1,3 @@
+<?php
+
+$wgObjectCaches['sessions'] = $wgObjectCaches['memcached-pecl'];
diff --git a/wmf-config/session.php b/wmf-config/session.php
new file mode 100644
index 0000000..6745755
--- /dev/null
+++ b/wmf-config/session.php
@@ -0,0 +1,47 @@
+<?php
+
+$sessionRedis = array(
+ 'pmtpa' => array(
+ '10.0.12.1', # mc1
+ '10.0.12.2', # mc2
+ '10.0.12.3', # mc3
+ '10.0.12.4', # mc4
+ '10.0.12.5', # mc5
+ '10.0.12.6', # mc6
+ '10.0.12.7', # mc7
+ '10.0.12.8', # mc8
+ '10.0.12.9', # mc9
+ '10.0.12.10', # mc10
+ '10.0.12.11', # mc11
+ '10.0.12.12', # mc12
+ '10.0.12.13', # mc13
+ '10.0.12.14', # mc14
+ '10.0.12.15', # mc15
+ '10.0.12.16', # mc16
+ ),
+ 'eqiad' => array(
+ '10.64.0.180', # mc1001
+ '10.64.0.181', # mc1002
+ '10.64.0.182', # mc1003
+ '10.64.0.183', # mc1004
+ '10.64.0.184', # mc1005
+ '10.64.0.185', # mc1006
+ '10.64.0.186', # mc1007
+ '10.64.0.187', # mc1008
+ '10.64.0.188', # mc1009
+ '10.64.0.189', # mc1010
+ '10.64.0.190', # mc1011
+ '10.64.0.191', # mc1012
+ '10.64.0.192', # mc1013
+ '10.64.0.193', # mc1014
+ '10.64.0.194', # mc1015
+ '10.64.0.195', # mc1016
+ ),
+);
+
+// Cache to hold user sessions in production:
+$wgObjectCaches['sessions'] = array(
+ 'class' => 'RedisBagOStuff',
+ 'servers' => $sessionRedis[$wmfDatacenter],
+ 'password' => $wmgRedisPassword,
+);
--
To view, visit https://gerrit.wikimedia.org/r/63839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id31586a4ffcb1bf036fbbe93837d709fdaab2cee
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
