shibd="@-PREFIX-@/sbin/shibd"
SHIBD_USER=root
SHIBD_UMASK=022
+SHIBD_WAIT=30
prog=shibd
pidfile=@-PKGRUNDIR-@/shibd.pid
lockfile=/var/lock/subsys/$prog
# 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
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"
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
shibd="@-PREFIX-@/sbin/shibd"
SHIBD_USER=root
SHIBD_UMASK=022
+SHIBD_WAIT=30
prog=shibd
pidfile=@-PKGRUNDIR-@/shibd.pid
lockfile=/var/lock/subsys/$prog
# 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
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"
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
# 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