X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/c9731b9b3ee43c4c8d82c31009a5870a01d3acfa..9a8de13739d797ae324dcf0387f24eda3cdcb4a9:/scripts/domtool-slave

diff --git a/scripts/domtool-slave b/scripts/domtool-slave
index 3611598..5392bea 100755
--- a/scripts/domtool-slave
+++ b/scripts/domtool-slave
@@ -1,9 +1,10 @@
 #!/usr/bin/pagsh.openafs
 
-# This script should go in /etc/init.d/ on Debian Linux systems running Domtool slaves.
+# This script should go in /etc/init.d/ on Debian Linux systems
+# running Domtool slaves.
 
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-PIDFILE="/var/run/k5start-domtool-slave.pid"
+PIDFILE="/var/run/domtool/k5start-slave.pid"
 
 set -e
 
@@ -13,11 +14,17 @@ case $1 in
 	if sudo -u domtool domtool-admin-sudo slave-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-slave-logged
 		echo "."
 	fi
@@ -35,7 +42,7 @@ case $1 in
 	;;
 
   restart|reload|force-reload)
-	$SELF stop
+	set +e; $SELF stop; set -e
 	$SELF start
 	;;