Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Vary twemproxy config location based on
getRealmSpecificFilename()
......................................................................
Vary twemproxy config location based on getRealmSpecificFilename()
Bug: 62836
Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index bf13fc1..1b9ce87 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,9 +13,15 @@
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; }
+ . $MW_COMMON_SOURCE/multiversion/MWRealm.sh
+ 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: merged
Gerrit-Change-Id: Ib9a8ede7103437f05e8a081993e6d9f94d591b36
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
