init scripts: Don't error out when stopping in restart action

[hcoop/domtool2.git] / scripts / domtool-server

diff --git a/scripts/domtool-server b/scripts/domtool-server
index 6d45215..da7282a 100755 (executable)
--- a/scripts/domtool-server
+++ b/scripts/domtool-server
@@ -9,16 +9,15 @@ set -e
 
 case $1 in
   start)
-       # Start daemon
        echo -n "Starting Domtool dispatcher: domtool-server"
        if sudo -u domtool domtool-admin-sudo ping; then
                echo "...already running."
        else
                start-stop-daemon --start --pidfile $PIDFILE \
                        -c domtool:domtool \
-                       --exec /usr/bin/k5start -- -b -f /etc/keytabs/domtool.keytab \
+                       --exec /usr/bin/k5start -- -U -b \
+                       -f /etc/keytabs/domtool \
                        -K 300 -t -p $PIDFILE \
-                       domtool/deleuze.hcoop.net \
                        domtool-server-logged
                echo "."
        fi
@@ -36,7 +35,7 @@ case $1 in
        ;;
 
   restart|reload|force-reload)
-       $SELF stop
+       set +e; $SELF stop; set -e
        $SELF start
        ;;