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

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

diff --git a/configs/shibd-suse.in b/configs/shibd-suse.in
index 318499f..d0bc01b 100644 (file)
--- a/configs/shibd-suse.in
+++ b/configs/shibd-suse.in
@@ -25,8 +25,12 @@ DAEMON=@-PREFIX-@/sbin/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 PID_FILE=@-PKGRUNDIR-@/shibd.pid
 SHIBD_USER=root
+SHIBD_UMASK=022
+SHIBD_WAIT=30
 DAEMON_OPTS=""
 
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+
 # Force removal of socket
 DAEMON_OPTS="$DAEMON_OPTS -f"
  
@@ -37,10 +41,10 @@ DAEMON_OPTS="$DAEMON_OPTS -c $SHIB_CONFIG"
 DAEMON_OPTS="$DAEMON_OPTS -p $PID_FILE"
 
 # Specify wait time to use
-DAEMON_OPTS="$DAEMON_OPTS -w 30"
+DAEMON_OPTS="$DAEMON_OPTS -w $SHIBD_WAIT"
+
+umask $SHIBD_UMASK
 
-[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
- 
 # Exit if the package is not installed.
 test -x "$DAEMON" || exit 5