[cpp-sp COMMIT] in /branches/REL_2: configs/shibd-amazon.in configs/shibd-debian.in configs/shibd-redhat.in configs/s...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul  1 20:27:48 2015
New Revision: 3920

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3920&view=rev
Log:
SSPCPP-654 - Move fork wait timeout from init script to sysconfig

Modified:
    branches/REL_2/configs/shibd-amazon.in
    branches/REL_2/configs/shibd-debian.in
    branches/REL_2/configs/shibd-redhat.in
    branches/REL_2/configs/shibd-suse.in
    branches/REL_2/shibboleth.spec.in

Modified: branches/REL_2/configs/shibd-amazon.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-amazon.in?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-amazon.in	(original)
+++ branches/REL_2/configs/shibd-amazon.in	Wed Jul  1 20:27:48 2015
@@ -26,6 +26,7 @@
 shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
 SHIBD_UMASK=022
+SHIBD_WAIT=30
 prog=shibd
 pidfile=@-PKGRUNDIR-@/shibd.pid
 lockfile=/var/lock/subsys/$prog
@@ -57,7 +58,7 @@
 
 	# Handle transition from root to non-root packages.
 	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
-	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
+	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w $SHIBD_WAIT
 
 	RETVAL=$?
 	echo

Modified: branches/REL_2/configs/shibd-debian.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-debian.in?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-debian.in	(original)
+++ branches/REL_2/configs/shibd-debian.in	Wed Jul  1 20:27:48 2015
@@ -24,11 +24,15 @@
 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,13 +44,10 @@
 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

Modified: branches/REL_2/configs/shibd-redhat.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-redhat.in?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-redhat.in	(original)
+++ branches/REL_2/configs/shibd-redhat.in	Wed Jul  1 20:27:48 2015
@@ -26,6 +26,7 @@
 shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
 SHIBD_UMASK=022
+SHIBD_WAIT=30
 prog=shibd
 pidfile=@-PKGRUNDIR-@/shibd.pid
 lockfile=/var/lock/subsys/$prog
@@ -57,7 +58,7 @@
 
 	# Handle transition from root to non-root packages.
 	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
-	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
+	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w $SHIBD_WAIT
 
 	RETVAL=$?
 	echo

Modified: branches/REL_2/configs/shibd-suse.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/shibd-suse.in?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- branches/REL_2/configs/shibd-suse.in	(original)
+++ branches/REL_2/configs/shibd-suse.in	Wed Jul  1 20:27:48 2015
@@ -26,7 +26,10 @@
 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"
@@ -38,9 +41,7 @@
 DAEMON_OPTS="$DAEMON_OPTS -p $PID_FILE"
 
 # Specify wait time to use
-DAEMON_OPTS="$DAEMON_OPTS -w 30"
-
-[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+DAEMON_OPTS="$DAEMON_OPTS -w $SHIBD_WAIT"
 
 umask $SHIBD_UMASK
 

Modified: branches/REL_2/shibboleth.spec.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibboleth.spec.in?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- branches/REL_2/shibboleth.spec.in	(original)
+++ branches/REL_2/shibboleth.spec.in	Wed Jul  1 20:27:48 2015
@@ -169,6 +169,12 @@
 
 # User account for shibd
 SHIBD_USER=%{runuser}
+
+# Umask for shibd
+# SHIBD_UMASK=022
+
+# Wait period (secs) for configuration (and metadata) to load
+SHIBD_WAIT=30
 EOF
 	%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 		cat >> $SYSCONFIG_SHIBD <<EOF