X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fshibd-redhat.in;h=1668333b9b98982dbc379cffc3880d2b15411a5c;hb=ccc5adbaf732b0ae9687eb08dfceef166ee251ff;hp=c642e700e6a725498b550eb2948b64d13688fcc4;hpb=003a168bba6f07e3c54e78fca280dc23d8e64add;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index c642e70..1668333 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -1,82 +1,132 @@
 #!/bin/bash
 #
-# Startup script for the Shibboleth Service Provider Daemon
+# shibd Shibboleth Service Provider Daemon
 #
-# chkconfig: - 98 02
+# chkconfig: - 80 20
 # description: Shibboleth 2 Service Provider Daemon
 # processname: shibd
 # pidfile: @-PKGRUNDIR-@/shibd.pid
 # config: @-PKGSYSCONFDIR-@/shibboleth2.xml
 
+### BEGIN INIT INFO
+# Provides: shibd
+# Required-Start: $local_fs $remote_fs $network
+# Should-Start: $time
+# Should-Stop: $time
+# Required-Stop: $local_fs $remote_fs $network
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6 
+# Short-Description: Shibboleth 2 Service Provider Daemon
+# Description: Starts the separate daemon used by the Shibboleth Apache module to manage state and SAML interactions.
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
+
 shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
-pidfile=@-PKGRUNDIR-@/shibd.pid
 prog=shibd
-RETVAL=0
+pidfile=@-PKGRUNDIR-@/shibd.pid
+lockfile=/var/lock/subsys/$prog
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
 start() {
 	echo -n $"Starting $prog: "
-	if [ -f /var/lock/subsys/shibd ] ; then
+	if [ -f $lockfile ] ; then
 		if [ -f $pidfile ]; then
 			read kpid < $pidfile
 			if checkpid $kpid 2>&1; then
 				echo "process already running"
-					return -1
-         		else
+					return 1;
+				else
 					echo "lock file found but no process running for pid $kpid, continuing"
 			fi
 		fi
 	fi
- 
+
+	# Make sure package run directory exists.
+	[ -d @-PKGRUNDIR-@ ] || mkdir @-PKGRUNDIR-@
+
 	export SHIBD_PID=$pidfile
- 	touch $pidfile
- 	chown $SHIBD_USER:$SHIBD_USER $pidfile
-	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
-		/sbin/restorecon $pidfile
-	fi
-	daemon --user $SHIBD_USER --pidfile $pidfile $shibd -p $pidfile -f
+	touch $pidfile
+	chown $SHIBD_USER:$SHIBD_USER $pidfile
+
+	# Handle transition from root to non-root packages.
+	chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+	daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
+
+    # Adjust native logging directory permission so log roll-over works
+    chown apache:apache @-SHIRELOGDIR-@
 
 	RETVAL=$?
 	echo
-		[ $RETVAL = 0 ] && touch /var/lock/subsys/shibd
+		[ $RETVAL -eq 0 ] && touch $lockfile
 	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	if [ -f $pidfile ]; then
-		killproc -p $pidfile shibd
-	else
-        killproc shibd
-	fi
+	killproc shibd
 
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/shibd $pidfile
+	[ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile
+	return $RETVAL
 }
 
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status $shibd
-	RETVAL=$?
-	;;
-  restart)
+restart() {
 	stop
 	sleep 5
 	start
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|restart}"
-	exit 1
+}
+
+reload() {
+	restart
+}
+
+force_reload() {
+	restart
+}
+
+rh_status() {
+	# run checks to determine if the service is running or use generic status
+	status $prog
+}
+
+rh_status_q() {
+	rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+	start)
+		rh_status_q && exit 0
+		$1
+		;;
+	stop)
+		rh_status_q || exit 0
+		$1
+		;;
+	restart)
+		$1
+		;;
+	reload)
+		rh_status_q || exit 7
+		$1
+		;;
+	force-reload)
+		force_reload
+		;;
+	status)
+		rh_status
+		;;
+	condrestart|try-restart)
+		rh_status_q || exit 0
+		restart
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+		exit 2
 esac
 
-exit $RETVAL
+exit $?