Imported Upstream version 2.4+dfsg

[shibboleth/sp.git] / configs / shibd-debian.in

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 3b59c86..59f0995 100644 (file)
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -7,8 +7,8 @@
 # Default-Stop: 0 1 6
 # Short-Description: Shibboleth 2 Service Provider Daemon
 # Description: Starts the separate daemon used by the Shibboleth
-#              Apache module to manage sessions and to retrieve
-#              attributes from Shibboleth Identity Providers.
+# Apache module to manage sessions and to retrieve
+# attributes from Shibboleth Identity Providers.
 ### END INIT INFO
 #
 # Written by Quanah Gibson-Mount <quanah@stanford.edu>
@@ -39,6 +39,9 @@ DAEMON_OPTS="$DAEMON_OPTS -c $SHIBSP_CONFIG"
 # Specify pid file to use
 DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE"
 
+# Specify wait time to use
+DAEMON_OPTS="$DAEMON_OPTS -w 30"
+
 # Exit if the package is not installed.
 [ -x "$DAEMON" ] || exit 0
 
@@ -63,15 +66,16 @@ start)
 stop)
     echo -n "Stopping $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --retry TERM/30/KILL/5 --exec $DAEMON
+        --exec $DAEMON
     echo "$NAME."
     ;;
 restart|force-reload)
     echo -n "Restarting $DESC: "
     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --retry TERM/30/KILL/5 --exec $DAEMON
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- $DAEMON_OPTS
+        --exec $DAEMON
+    sleep 1
+    start-stop-daemon --start --quiet \
+        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
     echo "$NAME."
     ;;
 *)