X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/62260c5f8627aa2abfd27f7c2e653eb3d900d793..861773ffb9c0affbdd26362581df23827316a0e1:/scripts/domtool-server

diff --git a/scripts/domtool-server b/scripts/domtool-server
index 6d45215..6078c60 100755
--- a/scripts/domtool-server
+++ b/scripts/domtool-server
@@ -1,24 +1,30 @@
 #!/usr/bin/pagsh.openafs
 
-# This script should go in /etc/init.d/ on Debian Linux systems running Domtool dispatchers.
+# This script should go in /etc/init.d/ on Debian Linux systems
+# running Domtool dispatchers.
 
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-PIDFILE="/var/run/k5start-domtool-server.pid"
+PIDFILE="/var/run/domtool/k5start-server.pid"
 
 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
+		PIDDIR=$(dirname "$PIDFILE")
+		if test ! -d "$PIDDIR"; then
+			mkdir -m 0755 $PIDDIR
+			chown domtool:domtool $PIDDIR
+		fi
+
 		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 +42,7 @@ case $1 in
 	;;
 
   restart|reload|force-reload)
-	$SELF stop
+	set +e; $SELF stop; set -e
 	$SELF start
 	;;