summaryrefslogtreecommitdiff
path: root/res/debian
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-10 21:04:59 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-12 14:59:04 +0300
commit35ae30e61ad77515f73153bfcc490f6070ef9c85 (patch)
tree947c450057dd550c4633849e0db5360482497606 /res/debian
parent3b6bcd0ddef7077cc894a57597d09bf885a6bef3 (diff)
rhizi.init: stop(): avoid killing all python processes
Diffstat (limited to 'res/debian')
-rw-r--r--res/debian/pkg__rhizi-single/rhizi.init5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/debian/pkg__rhizi-single/rhizi.init b/res/debian/pkg__rhizi-single/rhizi.init
index 758e8625..47cb296d 100644
--- a/res/debian/pkg__rhizi-single/rhizi.init
+++ b/res/debian/pkg__rhizi-single/rhizi.init
@@ -17,12 +17,13 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="rhizi-server"
NAME=rhizi__{{ domain_name }}
DAEMON=/usr/bin/python2.7
+RZ_DAEMON=/usr/lib/rhizi/rhizi-server/rz_server.py
PIDFILE=/var/run/rhizi/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
USERNAME=www-data
GROUPNAME=www-data
-ARGS__DAEMON="/usr/lib/rhizi/rhizi-server/rz_server.py --config-dir=/etc/rhizi/mux-conf.d/{{ domain_name }}/"
+ARGS__DAEMON="$RZ_DAEMON --config-dir=/etc/rhizi/mux-conf.d/{{ domain_name }}/"
ARGS__START_STOP_DAEMON="--make-pidfile --background --chuid ${USERNAME}:${GROUPNAME}"
# Exit if the package is not installed
@@ -81,7 +82,7 @@ do_stop()
# that waits for the process to drop all resources that could be
# needed by services started subsequently. A last resort is to
# sleep for some time.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --name $RZ_DAEMON
[ "$?" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit.