merge of '59576b63b875c6db3416e7be726b196610b856a3'

and 'cde43d75f3e5fde963846340d291c77e63d995f9'

Monotone-Parent: 59576b63b875c6db3416e7be726b196610b856a3
Monotone-Parent: cde43d75f3e5fde963846340d291c77e63d995f9
Monotone-Revision: d0b2cce64733874b10da170e30bdcb9f9730f61e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T14:58:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-01-12 14:58:20 +00:00
+4 -4
View File
@@ -80,11 +80,11 @@ case "$1" in
;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
start-stop-daemon --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5
start-stop-daemon --stop --pidfile $PIDFILE --retry=TERM/20/KILL/5 || true
# Ensure directory's existence and permissions
install -o sogo -g adm -m 755 -d /var/run/$NAME
install -o sogo -g adm -m 750 -d /var/spool/$NAME
install -o sogo -g adm -m 750 -d /var/log/$NAME
install -o $USER -g adm -m 755 -d /var/run/$NAME
install -o $USER -g adm -m 750 -d /var/spool/$NAME
install -o $USER -g adm -m 750 -d /var/log/$NAME
start-stop-daemon -c $USER --quiet --start --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
log_end_msg 0
;;