SSPCPP-654 - Move fork wait timeout from init script to sysconfig

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

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 59f0995..37efca4 100644 (file)
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -24,12 +24,16 @@ DESC="Shibboleth 2 daemon"
 NAME=shibd
 SHIB_HOME=@-PREFIX-@
 SHIBSP_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml
+SHIBD_WAIT=30
 LD_LIBRARY_PATH=@-PREFIX-@/lib
 DAEMON=@-PREFIX-@/sbin/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 PIDFILE=@-PKGRUNDIR-@/$NAME.pid
 DAEMON_OPTS=""
 
+# Read configuration if it is present.
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
 # Force removal of socket
 DAEMON_OPTS="$DAEMON_OPTS -f"
 
@@ -40,14 +44,11 @@ DAEMON_OPTS="$DAEMON_OPTS -c $SHIBSP_CONFIG"
 DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE"
 
 # Specify wait time to use
-DAEMON_OPTS="$DAEMON_OPTS -w 30"
+DAEMON_OPTS="$DAEMON_OPTS -w $SHIBD_WAIT"
 
 # Exit if the package is not installed.
 [ -x "$DAEMON" ] || exit 0
 
-# Read configuration if it is present.
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
 # Get the setting of VERBOSE and other rcS variables.
 [ -f /etc/default/rcS ] && . /etc/default/rcS