From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 19 Aug 2009 16:40:02 +0000 (+0000)
Subject: Bump default wait time for large configs like in the UK.
X-Git-Tag: 2.3~60
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=dcba585d9596c4b6b78ee0133f4500ae2a7fcb0b;hp=22c2dec93f2f53fcfa774afb08f9c04926ab91eb;p=shibboleth%2Fcpp-sp.git

Bump default wait time for large configs like in the UK.
---

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 13e8240..59f0995 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -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
 
diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index 02e3426..2f976c9 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -36,7 +36,7 @@ start() {
 	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 		/sbin/restorecon $pidfile
 	fi
-	daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f -w 3
+	daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f -w 30
 
 	RETVAL=$?
 	echo
diff --git a/configs/shibd-suse.in b/configs/shibd-suse.in
index 1dceeda..62a1619 100644
--- a/configs/shibd-suse.in
+++ b/configs/shibd-suse.in
@@ -32,6 +32,9 @@ DAEMON_OPTS="$DAEMON_OPTS -c $SHIB_CONFIG"
  
 # Specify pid file to use
 DAEMON_OPTS="$DAEMON_OPTS -p $PID_FILE"
+
+# Specify wait time to use
+DAEMON_OPTS="$DAEMON_OPTS -w 30"
  
 # Exit if the package is not installed.
 test -x "$DAEMON" || exit 5