Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129644
Change subject: Variable twemproxy config location
......................................................................
Variable twemproxy config location
Bug: 62836
Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/129644/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index bf13fc1..a065708 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,9 +13,12 @@
respawn limit 5 5
pre-start script
- [ -f /etc/wikimedia-site ] || { stop; exit 0; }
- [ -f "/usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site)".yaml ] || { stop; exit 0; }
+ [ -f /usr/local/lib/mw-deployment-vars.sh ] || { stop; exit 0; }
+ ./usr/local/lib/mw-deployment-vars.sh
+ [ -f $MW_COMMON_SOURCE/multiversion/MWRealm.sh ] || { stop; exit 0; }
+ env config = `getRealmSpecificFilename
"$MW_COMMON_SOURCE/wmf-config/twemproxy.yaml"`
+ [ -f "/usr/local/apache/common/wmf-config/$config" ] || { stop; exit
0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
"/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml"
+exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
"/usr/local/apache/common/wmf-config/$config"
--
To view, visit https://gerrit.wikimedia.org/r/129644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
