Dzahn has submitted this change and it was merged. Change subject: fix apache-graceful-all for use in eqiad ......................................................................
fix apache-graceful-all for use in eqiad fix the script to work from tin the original version on fenari stays untouched until this is tested Change-Id: Ib7bc824944e648752e822e3bc68c68c0fead1d94 --- M modules/apachesync/files/apache-graceful-all 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/apachesync/files/apache-graceful-all b/modules/apachesync/files/apache-graceful-all index bddd1bb..89160d9 100755 --- a/modules/apachesync/files/apache-graceful-all +++ b/modules/apachesync/files/apache-graceful-all @@ -1,8 +1,10 @@ #!/bin/bash -if [ `cat /etc/cluster` == pmtpa ]; then - /home/wikipedia/bin/dologmsg "$USER is doing a graceful restart of all apaches" +if [ `cat /etc/cluster` == eqiad ]; then + /usr/local/bin/dologmsg "$USER is doing a graceful restart of all apaches" fi -ddsh -F20 -g apaches -cM 'if [ -x /home/wikipedia/bin/apache-graceful ]; then echo "/home-mounted apache $(hostname)"; /home/wikipedia/bin/apache-graceful; else /usr/bin/apache-sanity-check && sudo /usr/sbin/apache2ctl graceful; fi' -if [ `cat /etc/cluster` == pmtpa ]; then - /home/wikipedia/bin/dologmsg "!log $USER gracefulled all apaches" + +dsh -F20 -g apaches -cM '/usr/bin/apache-sanity-check && sudo /usr/sbin/apache2ctl graceful' + +if [ `cat /etc/cluster` == eqiad ]; then + /usr/local/bin/dologmsg "!log $USER gracefulled all apaches" fi -- To view, visit https://gerrit.wikimedia.org/r/130600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7bc824944e648752e822e3bc68c68c0fead1d94 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@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
