Filippo Giunchedi has submitted this change and it was merged.

Change subject: zuul: replace 'zuul-merger' by $NAME
......................................................................


zuul: replace 'zuul-merger' by $NAME

Caught by Filippo Giunchedi on another review, 'zuul-merger' was
hardcoded in start-stop-daemon, replace it with $NAME.

The zuul.init script hardcodes 'zuul-server', but that is because the
name of the service is 'zuul' so we can not use $NAME there.

Change-Id: Ied92d1ed7e51e3230834571dd0ec245d576bc099
---
M modules/zuul/files/zuul-merger.init
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/zuul/files/zuul-merger.init 
b/modules/zuul/files/zuul-merger.init
index db5b98a..e3bda89 100755
--- a/modules/zuul/files/zuul-merger.init
+++ b/modules/zuul/files/zuul-merger.init
@@ -93,7 +93,7 @@
        # restarting (for example, when it is sent a SIGHUP),
        # then implement that here.
        #
-       start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name 
zuul-merger
+       start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name 
$NAME
        return 0
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/201181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied92d1ed7e51e3230834571dd0ec245d576bc099
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to