further pid file standardization

system/init.d/kazoo-bigcouch.redhat

@@ -5,7 +5,7 @@
 # chkconfig: 345 13 87
 # description: BigCouch is a dynamo-style distributed database based on Apache CouchDB.
 # processname: bigcouch
-# pidfile: /var/run/kazoo-bigcouch.pid
+# pidfile: /var/run/bigcouch/kazoo-bigcouch.pid
 #
 
 RETVAL=0
@@ -15,6 +15,7 @@ LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-bigcouch}
 
 start() {
 	echo -n $"Starting BigCouch: "
+	/usr/sbin/kazoo-bigcouch prepare >/dev/null 2>&1
 	/usr/sbin/kazoo-bigcouch start >/dev/null 2>&1
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then

system/init.d/kazoo-freeswitch.redhat

@@ -12,8 +12,7 @@
 #
 
 RETVAL=0
-PID_FILE=${PID_FILE:-/var/run/freeswitch/kazoo/freeswitch.pid}
-FS_USER=${FS_USER:-freeswitch}
+PID_FILE=${PID_FILE:-/var/run/freeswitch/kazoo-freeswitch.pid}
 LOCK_FILE=/var/lock/subsys/kazoo-freeswitch
 
 . /etc/init.d/functions
@@ -27,7 +26,8 @@ start() {
 			return 1
 		fi
 	fi
-        daemon --user ${FS_USER} --pidfile ${PID_FILE} "/usr/sbin/kazoo-freeswitch start >/dev/null 2>&1"
+        /usr/sbin/kazoo-freeswitch prepare >/dev/null 2>&1
+        daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-freeswitch start >/dev/null 2>&1"
 	RETVAL=$?
         if [ ${RETVAL} -eq 0 ]; then
                 touch ${LOCK_FILE}

system/init.d/kazoo-haproxy.redhat

@@ -8,7 +8,7 @@
 #				proxying for TCP and  HTTP-based applications
 # processname: haproxy
 # config:	   /etc/kazoo/haproxy/haproxy.cfg
-# pidfile:	   /var/run/kazoo-haproxy.pid
+# pidfile:	   /var/run/haproxy/kazoo-haproxy.pid
 
 RETVAL=0
 LOCK_FILE=/var/lock/subsys/kazoo-haproxy
@@ -17,7 +17,8 @@ LOCK_FILE=/var/lock/subsys/kazoo-haproxy
 
 start() {
 	echo -n $"Starting HAProxy: "
-	/usr/sbin/kazoo-haproxy start >/dev/null 2>&1
+	/usr/sbin/kazoo-haproxy prepare >/dev/null 2>&1
+        /usr/sbin/kazoo-haproxy start >/dev/null 2>&1
 	RETVAL=$?
         if [ ${RETVAL} -eq 0 ]; then
                 touch ${LOCK_FILE}

system/init.d/kazoo-kamailio.redhat

@@ -5,125 +5,76 @@
 # chkconfig: 345 85 15
 # description: Kamailio is a fast, reliable and flexible SIP Server.
 # processname: kamailio
-# pidfile: /var/run/kazoo-kamailio/kamailio.pid
-# config: /etc/kamailio/kamailio.cfg
+# pidfile: /var/run/kamailio/kazoo-kamailio.pid
+# config: /etc/kazoo/kamailio/kamailio.cfg
 #
-# Source function library.
-. /etc/rc.d/init.d/functions
 
-KAM=/usr/sbin/kamailio
-PROG=kamailio
-PID_FILE=/var/run/kazoo-kamailio/kamailio.pid
-LOCK_FILE=/var/lock/subsys/kazoo-kamailio
 RETVAL=0
-DEFAULTS=/etc/default/kamailio
-RUN_KAMAILIO=no
-CFG_FILE=/etc/kazoo/kamailio/kamailio.cfg
-
-# Do not start kamailio if fork=no is set in the config file
-# otherwise the boot process will just stop
-check_fork ()
-{
-    if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $CFG_FILE; then
-        echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead"
-        exit 1
-    fi
-}
-
-check_kamailio_config ()
-{
-        # Check if kamailio configuration is valid before starting the server
-        out=$($KAM -c 2>&1 > /dev/null)
-        retcode=$?
-        if [ "$retcode" != '0' ]; then
-            echo "Not starting $DESC: invalid configuration file!"
-            echo -e "\n$out\n"
-            exit 1
-        fi
-}
+LOCK_FILE=/var/lock/subsys/kazoo-kamailio
 
+. /etc/rc.d/init.d/functions
 
 start() {
-	check_kamailio_config
-        if [ "$1" != "debug" ]; then
-            check_fork
-        fi
-        mkdir -p /var/run/kazoo-kamailio
-        mkdir -p /var/run/kamailio
-        chown kamailio -R /var/run/kazoo-kamailio
-        chown kamailio -R /var/run/kamailio
-	echo -n $"Starting $PROG: "
-	daemon $KAM $OPTIONS -f $CFG_FILE >/dev/null 2>/dev/null
+	echo -n $"Starting Kamailio: "
+	/usr/sbin/kazoo-kamailio prepare >/dev/null 2>&1
+	/usr/sbin/kazoo-kamailio start >/dev/null 2>&1
 	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && touch $LOCK_FILE && success
-	return $RETVAL
+		if [ ${RETVAL} -eq 0 ]; then
+			touch ${LOCK_FILE}
+			success $"OK"
+			echo
+		else
+			failure $"Kamailio is already running or failed to start!"
+			echo
+		fi
 }
 
 stop() {
-	echo -n $"Stopping $PROG: "
-	killproc $KAM
+	echo -n $"Stopping Kamailio: "
+	/usr/sbin/kazoo-kamailio stop >/dev/null 2>&1
 	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE
+		if [ ${RETVAL} -eq 0 ]; then
+			rm -f ${LOCK_FILE} ${pidfile}
+			success $"OK"
+			echo
+		else
+			failure $"Kamailio is still running!"
+			echo
+		fi
 }
 
-# Load startup options if available
-if [ -f $DEFAULTS ]; then
-   . $DEFAULTS || true
-fi
-
-if [ "$RUN_KAMAILIO" != "yes" ]; then
-    echo "Kamailio not yet configured. Edit /etc/default/kamailio first."
-    exit 0
-fi
-
-SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`))
-PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`))
-[ -z "$USER" ]  && USER=kamailio
-[ -z "$GROUP" ] && GROUP=kamailio
-[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64
-[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=8
-
-if test "$DUMP_CORE" = "yes" ; then
-    # set proper ulimit
-    ulimit -c unlimited
-
-    # directory for the core dump files
-    # COREDIR=/home/corefiles
-    # [ -d $COREDIR ] || mkdir $COREDIR
-    # chmod 777 $COREDIR
-    # echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern
-fi
-
-OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS"
+status() {
+	/usr/sbin/kazoo-kamailio status
+	RETVAL=$?
+}
 
+restart() {
+	stop
+	start
+}
 
-# See how we were called.
 case "$1" in
-	start|debug)
+	start)
 		start
 		;;
 	stop)
 		stop
 		;;
 	status)
-		status $KAM
-		RETVAL=$?
+		status
 		;;
-	restart)
-		stop
-		start
+	check)
+		/usr/sbin/kazoo-haproxy check
 		;;
+	restart|reload)
+		restart
+			;;
 	condrestart)
-		if [ -f $PID_FILE ] ; then
-			stop
-			start
-		fi
+		[ ! -e ${LOCK_FILE} ] && restart
 		;;
 	*)
-		echo $"Usage: $PROG {start|stop|restart|condrestart|status|debug|help}"
-		exit 1
+		echo $"Usage: $0 (start|stop|restart|status|check)"
+		RETVAL=1
 esac
 
-exit $RETVAL
+exit ${RETVAL}

system/sbin/kazoo-bigcouch

@@ -5,11 +5,13 @@ if [ -f /etc/default/bigcouch ]; then
 fi
 
 if [ -f /etc/sysconfig/bigcouch ]; then
+	. /etc/sysconfig/bigcouch
 fi
 
 RETVAL=0
 USER=${BIGCOUCH_USER:-bigcouch}
 BIN_FILE=${BIGCOUCH_BIN:-/opt/bigcouch/bin/bigcouch}
+PID_FILE=${BIGCOUCH_PID:-/var/run/bigcouch/kazoo-bigcouch.pid}
 export HOME=${BIGCOUCH_HOME:-/srv}
 
 # Detect core count
@@ -24,7 +26,11 @@ prepare() {
 	mkdir -p ${HOME}
 	chown -R ${USER} ${HOME}
 	mkdir -p /var/log/bigcouch
-	chown -R ${USER} /var/log/bigcouch        
+	chown -R ${USER} /var/log/bigcouch
+	mkdir -p /var/run/bigcouch
+	chown -R ${USER} /var/run/bigcouch
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE} 
 }
 
 start() {

system/sbin/kazoo-kamailio

@@ -12,8 +12,8 @@ RETVAL=0
 USER=${KAMAILIO_USER:-kamailio}
 GROUP=${KAMAILIO_GROUP:-kamailio}
 BIN_FILE=${KAMAILIO_BIN:-/usr/sbin/kamailio}
+PID_FILE=${KAMAILIO_PID:-/var/run/kamailio/kazoo-kamailio.pid}
 CFG_FILE=${KAMAILIO_CONFIG:-/etc/kazoo/kamailio/kamailio.cfg}
-PID_FILE=${KAMAILIO_PID:-/var/run/kazoo-kamailio/kamailio.pid}
 export HOME=${KAMAILIO_HOME:-/var/run/kamailio}
 
 OPTIONS="-P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS}"
@@ -27,10 +27,10 @@ if test "$DUMP_CORE" = "yes" ; then
 fi
 
 prepare() {
-	mkdir -p /var/run/kazoo-kamailio
-	chown -R ${USER} /var/run/kazoo-kamailio
 	mkdir -p /var/run/kamailio
 	chown -R ${USER} /var/run/kamailio
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE}
 }
 
 start() {