From 90166c1b2747b4010385b56426ffd4d4d77f90be Mon Sep 17 00:00:00 2001
From: bitbashing <bitbashing@gmail.com>
Date: Wed, 15 Jun 2016 13:46:03 -0700
Subject: [PATCH] turns out, creating the pid file causes issues

---
 system/init.d/kazoo-kamailio.redhat | 16 ++++++++--------
 system/sbin/kazoo-applications      |  5 +++--
 system/sbin/kazoo-bigcouch          |  5 +++--
 system/sbin/kazoo-ecallmgr          |  5 +++--
 system/sbin/kazoo-freeswitch        |  5 +++--
 system/sbin/kazoo-haproxy           |  5 +++--
 system/sbin/kazoo-kamailio          |  7 ++++---
 system/sbin/kazoo-rabbitmq          |  5 +++--
 8 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/system/init.d/kazoo-kamailio.redhat b/system/init.d/kazoo-kamailio.redhat
index 00ea87d..884f280 100755
--- a/system/init.d/kazoo-kamailio.redhat
+++ b/system/init.d/kazoo-kamailio.redhat
@@ -20,14 +20,14 @@ start() {
 	/usr/sbin/kazoo-kamailio prepare >/dev/null 2>&1
 	daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-kamailio start >/dev/null 2>&1"
 	RETVAL=$?
-		if [ ${RETVAL} -eq 0 ]; then
-			touch ${LOCK_FILE}
-			success $"OK"
-			echo
-		else
-			failure $"Kamailio is already running or failed to start!"
-			echo
-		fi
+	if [ ${RETVAL} -eq 0 ]; then
+		touch ${LOCK_FILE}
+		success $"OK"
+		echo
+	else
+		failure $"Kamailio is already running or failed to start!"
+		echo
+	fi
 }
 
 stop() {
diff --git a/system/sbin/kazoo-applications b/system/sbin/kazoo-applications
index 4f5281f..2e2edfe 100755
--- a/system/sbin/kazoo-applications
+++ b/system/sbin/kazoo-applications
@@ -32,8 +32,9 @@ prepare() {
 	chown -R ${USER} /var/log/kazoo
 	mkdir -p /var/run/kazoo
 	chown -R ${USER} /var/run/kazoo
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE}
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi
 }
 
 start() {
diff --git a/system/sbin/kazoo-bigcouch b/system/sbin/kazoo-bigcouch
index f430f8f..7833cfd 100755
--- a/system/sbin/kazoo-bigcouch
+++ b/system/sbin/kazoo-bigcouch
@@ -29,8 +29,9 @@ prepare() {
 	chown -R ${USER} /var/log/bigcouch
 	mkdir -p /var/run/bigcouch
 	chown -R ${USER} /var/run/bigcouch
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE} 
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi 
 }
 
 start() {
diff --git a/system/sbin/kazoo-ecallmgr b/system/sbin/kazoo-ecallmgr
index 7fbf113..020dbf6 100755
--- a/system/sbin/kazoo-ecallmgr
+++ b/system/sbin/kazoo-ecallmgr
@@ -32,8 +32,9 @@ prepare() {
 	chown -R ${USER} /var/log/kazoo
 	mkdir -p /var/run/kazoo
 	chown -R ${USER} /var/run/kazoo
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE}
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi
 }
 
 start() {
diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch
index 68d99e0..98fa3a2 100755
--- a/system/sbin/kazoo-freeswitch
+++ b/system/sbin/kazoo-freeswitch
@@ -26,8 +26,9 @@ prepare() {
 	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} 	
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi	
 }
 
 start() {
diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy
index deda04d..bd03722 100755
--- a/system/sbin/kazoo-haproxy
+++ b/system/sbin/kazoo-haproxy
@@ -20,8 +20,9 @@ prepare() {
 	chown -R ${USER} /var/log/haproxy
 	mkdir -p /var/run/haproxy
 	chown -R ${USER} /var/run/haproxy
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE}
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi
 }
 
 start() {
diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio
index 39a08ad..64d182f 100755
--- a/system/sbin/kazoo-kamailio
+++ b/system/sbin/kazoo-kamailio
@@ -29,8 +29,9 @@ fi
 prepare() {
 	mkdir -p /var/run/kamailio
 	chown -R ${USER} /var/run/kamailio
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE}
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi
 }
 
 start() {
@@ -48,7 +49,7 @@ start() {
 	RETVAL=$?
 	
 	if [ ${RETVAL} -ne 0 ]; then
-		echo "Failed to start BigCouch!"
+		echo "Failed to start Kamailio!"
 		RETVAL=1
 	fi
 }
diff --git a/system/sbin/kazoo-rabbitmq b/system/sbin/kazoo-rabbitmq
index 9be2adc..7158525 100755
--- a/system/sbin/kazoo-rabbitmq
+++ b/system/sbin/kazoo-rabbitmq
@@ -30,8 +30,9 @@ prepare() {
 	chown -R ${USER} /var/log/rabbitmq
 	mkdir -p /var/run/rabbitmq
 	chown -R ${USER} /var/run/rabbitmq
-	touch ${PID_FILE}
-	chown ${USER} ${PID_FILE}
+	if [ -e ${PID_FILE} ]; then
+		rm -rf ${PID_FILE}
+	fi
 }
 
 start() {