Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129655
Change subject: Revert "Vary twemproxy config location based on
getRealmSpecificFilename()"
......................................................................
Revert "Vary twemproxy config location based on getRealmSpecificFilename()"
/usr/local/lib/mw-deployment-vars.sh is not valid dash syntax and as a
result upstart fails badly to start the job.
This reverts commit 70fed5288d2697aa3eead6af1932a4c4d89dc70c.
Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/129655/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index 1b9ce87..bf13fc1 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,15 +13,9 @@
respawn limit 5 5
pre-start script
- [ -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; }
+ [ -f /etc/wikimedia-site ] || { stop; exit 0; }
+ [ -f "/usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site)".yaml ] || { stop; exit 0; }
end script
-exec /usr/local/bin/nutcracker -m 65536 -a 127.0.0.1 -c
"/usr/local/apache/common/wmf-config/$config"
+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"
--
To view, visit https://gerrit.wikimedia.org/r/129655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I587d8af7871e8db695171a5296562e33f9ccb128
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
