X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/721ff8ccc6a84ecb2285c997b0fd07c8b972d9de..64c04e02c688e696b0c3a7a0eb7fd70e2501e9c2:/scripts/domtool-slave

diff --git a/scripts/domtool-slave b/scripts/domtool-slave
index 2d5588f..e51ac89 100755
--- a/scripts/domtool-slave
+++ b/scripts/domtool-slave
@@ -1,11 +1,26 @@
-#!/usr/bin/pagsh.openafs
+#!/bin/sh
+# -*- sh -*-
 
-# 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.
+
+# This script is NOT lsb compliant by a long shot... need to fix that
+# We need nscd running to lookup afs users for whatever reason
+
+### BEGIN INIT INFO
+# Provides:             domtool-slave
+# Required-Start:       $remote_fs $network $time openafs-client nscd
+# Required-Stop:        $remote_fs $network openafs-client nscd
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    Domtool Slave
+# Description:          Launches the domtool slave
+### END INIT INFO
 
 SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
-PIDFILE="/var/run/k5start-domtool-slave.pid"
+PIDFILE="/var/run/domtool/k5start-slave.pid"
 
-set -e
+. /lib/lsb/init-functions
 
 case $1 in
   start)
@@ -13,12 +28,18 @@ 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 0750 $PIDDIR
+			chown domtool:nogroup $PIDDIR
+		fi
+
 		start-stop-daemon --start --pidfile $PIDFILE \
-			-c domtool:domtool \
+			-c domtool:nogroup \
 			--exec /usr/bin/k5start -- -U -b \
 			-f /etc/keytabs/domtool \
 			-K 300 -t -p $PIDFILE \
-			domtool-slave-logged
+			/usr/local/bin/domtool-slave-logged
 		echo "."
 	fi
 	;;
@@ -35,7 +56,7 @@ case $1 in
 	;;
 
   restart|reload|force-reload)
-	$SELF stop
+	set +e; $SELF stop; set -e
 	$SELF start
 	;;