Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129656
Change subject: Cannot use mw-deployment-vars.sh in dash/upstart
......................................................................
Cannot use mw-deployment-vars.sh in dash/upstart
Comment out that code, leave a comment
Manually set MW_COMMON="/usr/local/apache/common-local"
Change-Id: I553f9113b574844814a15eb23e66c6a24433cc92
---
M modules/generic/files/upstart/twemproxy.conf
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/129656/1
diff --git a/modules/generic/files/upstart/twemproxy.conf
b/modules/generic/files/upstart/twemproxy.conf
index 1b9ce87..06dc5a9 100644
--- a/modules/generic/files/upstart/twemproxy.conf
+++ b/modules/generic/files/upstart/twemproxy.conf
@@ -13,15 +13,16 @@
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
+ # Cannot use mw-deployment-vars.sh as not compatible with dash
+ # [ -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 MW_COMMON = "/usr/local/apache/common-local"
+ [ -f "$MW_COMMON/multiversion/MWRealm.sh" ] || { stop; exit 0; }
+ . $MW_COMMON/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/$config"
-
--
To view, visit https://gerrit.wikimedia.org/r/129656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I553f9113b574844814a15eb23e66c6a24433cc92
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
