standardize pid files and formating

system/init.d/kazoo-generic.redhat

@@ -19,6 +19,7 @@ fi
 
 start() {
 	echo -n $"Starting ${SCRIPT_NAME}: "
+	/usr/sbin/${SCRIPT_NAME} prepare >/dev/null 2>&1
 	/usr/sbin/${SCRIPT_NAME} start >/dev/null 2>&1
 	RETVAL=$?
 	if [ ${RETVAL} -eq 0 ]; then

system/sbin/kazoo-applications

@@ -7,7 +7,8 @@ fi
 RETVAL=0
 NAME=kazoo-applications
 USER=${KAZOO_USER:-kazoo}
-BIN_FILE=${BIN_FILE:-/opt/kazoo/bin/kazoo}
+BIN_FILE=${KAZOO_BIN:-/opt/kazoo/bin/kazoo}
+PID_FILE=${KAZOO_PID:-/var/run/kazoo/${NAME}.pid}
 export HOME=${KAZOO_ROOT:-/opt/kazoo}
 export VMARGS_PATH=${KAZOO_VMARGS:-/etc/kazoo/core/vm.args}
 
@@ -24,11 +25,15 @@ fi
 export NAME_ARG="-name ${NAME}"
 
 prepare() {
+	chown -R ${USER} /opt/kazoo /opt/kazoo/.*
 	mkdir -p /tmp/erl_pipes/${NAME}
 	chown -R ${USER} /tmp/erl_pipes/${NAME}
 	mkdir -p /var/log/kazoo
 	chown -R ${USER} /var/log/kazoo
-	chown -R ${USER} /opt/kazoo /opt/kazoo/.*
+	mkdir -p /var/run/kazoo
+	chown -R ${USER} /var/run/kazoo
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE}
 }
 
 start() {

system/sbin/kazoo-ecallmgr

@@ -7,7 +7,8 @@ fi
 RETVAL=0
 NAME=kazoo-ecallmgr
 USER=${KAZOO_USER:-kazoo}
-BIN_FILE=${BIN_FILE:-/opt/kazoo/bin/kazoo}
+BIN_FILE=${KAZOO_BIN:-/opt/kazoo/bin/kazoo}
+PID_FILE=${KAZOO_PID:-/var/run/kazoo/${NAME}.pid}
 export HOME=${KAZOO_ROOT:-/opt/kazoo}
 export VMARGS_PATH=${KAZOO_VMARGS:-/etc/kazoo/core/vm.args}
 
@@ -24,11 +25,15 @@ fi
 export NAME_ARG="-name ${NAME}"
 
 prepare() {
+	chown -R ${USER} /opt/kazoo /opt/kazoo/.*
 	mkdir -p /tmp/erl_pipes/${NAME}
 	chown -R ${USER} /tmp/erl_pipes/${NAME}
 	mkdir -p /var/log/kazoo
 	chown -R ${USER} /var/log/kazoo
-	chown -R ${USER} /opt/kazoo /opt/kazoo/.*
+	mkdir -p /var/run/kazoo
+	chown -R ${USER} /var/run/kazoo
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE}
 }
 
 start() {

system/sbin/kazoo-freeswitch

@@ -10,21 +10,24 @@ fi
 
 RETVAL=0
 USER=${FS_USER:-freeswitch}
-CFG_FILE=${FS_CONFIG:-/etc/kazoo/freeswitch}
 BIN_FILE=${FS_BIN:-/usr/bin/freeswitch}
-export HOME=${FS_HOME:-/var/run/kazoo-freeswitch}
+PID_FILE=${FS_PID:-/var/run/freeswitch/kazoo-freeswitch.pid}
+CFG_FILE=${FS_CONFIG:-/etc/kazoo/freeswitch}
+export HOME=${FS_HOME:-/var/lib/kazoo-freeswitch}
 
 if [ -z "${FREESWITCH_ARGS}" ]; then
 	FREESWITCH_ARGS="-nonat -conf ${CFG_FILE} -db /var/lib/kazoo-freeswitch/db -log /var/log/freeswitch -cache /var/lib/kazoo-freeswitch/cache -sounds /var/lib/kazoo-freeswitch/sounds -storage /var/lib/kazoo-freeswitch/storage"
 fi
 
 prepare() {
-	mkdir ${HOME}
-	chown -R ${USER} ${HOME}
 	mkdir -p /var/log/freeswitch
 	chown -R ${USER} /var/log/freeswitch
 	mkdir -p /var/lib/kazoo-freeswitch/{db,cache,sounds,storage}
 	chown -R ${USER} /var/lib/kazoo-freeswitch
+	mkdir -p /var/run/freeswitch
+	chown -R ${USER} /var/run/freeswitch
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE} 	
 }
 
 start() {

system/sbin/kazoo-haproxy

@@ -10,16 +10,16 @@ fi
 
 RETVAL=0
 USER=${HAPROXY_USER:-haproxy}
-CFG_FILE=${HAPROXY_CONFIG:-/etc/kazoo/haproxy/haproxy.cfg}
-PID_FILE=${HAPROXY_PID:-/var/run/haproxy/kazoo-haproxy.pid}
 BIN_FILE=${HAPROXY_BIN:-/usr/sbin/haproxy}
+PID_FILE=${HAPROXY_PID:-/var/run/haproxy/kazoo-haproxy.pid}
+CFG_FILE=${HAPROXY_CONFIG:-/etc/kazoo/haproxy/haproxy.cfg}
 export HOME=${HAPROXY_HOME:-/var/lib/haproxy}
 
 prepare() {
-	mkdir -p /var/run/haproxy
-	chown -R ${USER} /var/run/haproxy
 	mkdir -p /var/log/haproxy
 	chown -R ${USER} /var/log/haproxy
+	mkdir -p /var/run/haproxy
+	chown -R ${USER} /var/run/haproxy
 	touch ${PID_FILE}
 	chown ${USER} ${PID_FILE}
 }

system/sbin/kazoo-rabbitmq

@@ -6,8 +6,9 @@ fi
 
 RETVAL=0
 USER=${RABBITMQ_USER-rabbitmq}
-CFG_FILE=${RABBITMQ_ENV:-/etc/kazoo/rabbitmq/rabbitmq-env.conf}
 BIN_FILE=${RABBITMQ_BIN:-/usr/lib/rabbitmq/bin/rabbitmq-server}
+PID_FILE=${RABBITMQ_PID:-/var/run/rabbitmq/kazoo-rabbitmq.pid}
+CFG_FILE=${RABBITMQ_ENV:-/etc/kazoo/rabbitmq/rabbitmq-env.conf}
 
 while read LINE; do
 	export RABBITMQ_$LINE
@@ -27,6 +28,10 @@ prepare() {
 	chown -R ${USER} ${HOME}
 	mkdir -p /var/log/rabbitmq
 	chown -R ${USER} /var/log/rabbitmq
+	mkdir -p /var/run/rabbitmq
+	chown -R ${USER} /var/run/rabbitmq
+	touch ${PID_FILE}
+	chown ${USER} ${PID_FILE}
 }
 
 start() {

system/systemd/kazoo-bigcouch.service

@@ -8,6 +8,7 @@ User=bigcouch
 Group=daemon
 WorkingDirectory=/srv
 PermissionsStartOnly=true
+PIDFile=/var/run/bigcouch/kazoo-bigcouch.pid
 ExecStartPre=/usr/sbin/kazoo-bigcouch prepare
 ExecStart=/usr/sbin/kazoo-bigcouch start
 ExecStop=/usr/sbin/kazoo-bigcouch stop

system/systemd/kazoo-freeswitch.service

@@ -8,6 +8,7 @@ User=freeswitch
 Group=daemon
 WorkingDirectory=/var/run/kazoo-freeswitch
 PermissionsStartOnly=true
+PIDFile=/var/run/freeswitch/kazoo-freeswitch.pid
 # RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf
 #RuntimeDirectory=/run/freeswitch
 #RuntimeDirectoryMode=0750

system/systemd/kazoo-kamailio.service

@@ -7,7 +7,7 @@ User=kamailio
 Group=daemon
 WorkingDirectory=/var/run/kamailio
 PermissionsStartOnly=true
-PIDFile=/var/run/kazoo-kamailio/kamailio.pid
+PIDFile=/var/run/kamailio/kazoo-kamailio.pid
 ExecStartPre=/usr/sbin/kazoo-kamailio prepare
 ExecStart=/usr/sbin/kazoo-kamailio foreground
 ExecReload=/usr/bin/kill -HUP $MAINPID

system/systemd/kazoo-rabbitmq.service

@@ -8,6 +8,7 @@ User=rabbitmq
 Group=daemon
 WorkingDirectory=/var/lib/rabbitmq
 PermissionsStartOnly=true
+PIDFile=/var/run/rabbitmq/kazoo-rabbitmq.pid
 ExecStartPre=/usr/sbin/kazoo-rabbitmq prepare
 ExecStart=/usr/sbin/kazoo-rabbitmq start
 ExecStop=/usr/sbin/kazoo-rabbitmq stop