From b6adaeebd3a82a40d4599061cf5d0a2bc02a8f5c Mon Sep 17 00:00:00 2001
From: bitbashing <bitbashing@gmail.com>
Date: Wed, 15 Jun 2016 17:04:21 -0700
Subject: [PATCH] resolve fresh install issues on centos 7

---
 system/sbin/kazoo-kamailio                | 11 +----------
 system/systemd/kazoo-applications.service |  2 --
 system/systemd/kazoo-bigcouch.service     |  2 --
 system/systemd/kazoo-ecallmgr.service     |  2 --
 system/systemd/kazoo-freeswitch.service   |  2 --
 system/systemd/kazoo-haproxy.service      |  1 -
 system/systemd/kazoo-rabbitmq.service     |  4 +---
 7 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio
index 64d182f..7769ace 100755
--- a/system/sbin/kazoo-kamailio
+++ b/system/sbin/kazoo-kamailio
@@ -16,7 +16,6 @@ PID_FILE=${KAMAILIO_PID:-/var/run/kamailio/kazoo-kamailio.pid}
 CFG_FILE=${KAMAILIO_CONFIG:-/etc/kazoo/kamailio/kamailio.cfg}
 export HOME=${KAMAILIO_HOME:-/var/run/kamailio}
 
-OPTIONS="-P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS}"
 SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`))
 PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`))
 [ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64
@@ -40,7 +39,7 @@ start() {
 	check_config
 	check_fork
 
-	set -- ${BIN_FILE} -f ${CFG_FILE} -P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} "$@"
+	set -- ${BIN_FILE} -f ${CFG_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} "$@"
 	if [ "$(whoami)" == "${USER}" ]; then
 		exec "$@"
 	else
@@ -92,11 +91,6 @@ check_config ()
 	fi
 }
 
-pid() {
-	cat ${PID_FILE}
-	RETVAL=$?
-}
-
 case "$1" in
 	prepare)
 		prepare
@@ -121,9 +115,6 @@ case "$1" in
 	check)
 		check_config
 		;;
-	pid)
-		pid
-		;;
 	*)
 		echo $"Usage: $0 {prepare|start|foreground|stop|restart|status|check|pid}"
 		RETVAL=1
diff --git a/system/systemd/kazoo-applications.service b/system/systemd/kazoo-applications.service
index 37728af..4727b16 100644
--- a/system/systemd/kazoo-applications.service
+++ b/system/systemd/kazoo-applications.service
@@ -5,9 +5,7 @@ After=syslog.target network.target
 [Service]
 User=kazoo
 Group=daemon
-WorkingDirectory=/opt/kazoo
 PermissionsStartOnly=true
-PIDFile=/var/run/kazoo/kazoo-applications.pid
 ExecStartPre=/usr/sbin/kazoo-applications prepare
 ExecStart=/usr/sbin/kazoo-applications foreground
 ExecReload=/usr/bin/kill -HUP $MAINPID
diff --git a/system/systemd/kazoo-bigcouch.service b/system/systemd/kazoo-bigcouch.service
index 5dcf8ce..271d03e 100644
--- a/system/systemd/kazoo-bigcouch.service
+++ b/system/systemd/kazoo-bigcouch.service
@@ -6,9 +6,7 @@ After=syslog.target network.target
 Type=forking
 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
diff --git a/system/systemd/kazoo-ecallmgr.service b/system/systemd/kazoo-ecallmgr.service
index 6aacb19..5ca18c5 100644
--- a/system/systemd/kazoo-ecallmgr.service
+++ b/system/systemd/kazoo-ecallmgr.service
@@ -5,9 +5,7 @@ After=syslog.target network.target
 [Service]
 User=kazoo
 Group=daemon
-WorkingDirectory=/opt/kazoo
 PermissionsStartOnly=true
-PIDFile=/var/run/kazoo/kazoo-ecallmgr.pid
 ExecStartPre=/usr/sbin/kazoo-ecallmgr prepare
 ExecStart=/usr/sbin/kazoo-ecallmgr foreground
 ExecReload=/usr/bin/kill -HUP $MAINPID
diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service
index 7fc93f6..095bcab 100644
--- a/system/systemd/kazoo-freeswitch.service
+++ b/system/systemd/kazoo-freeswitch.service
@@ -6,9 +6,7 @@ After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.se
 [Service]
 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
diff --git a/system/systemd/kazoo-haproxy.service b/system/systemd/kazoo-haproxy.service
index f97f7a1..ddaaa5a 100644
--- a/system/systemd/kazoo-haproxy.service
+++ b/system/systemd/kazoo-haproxy.service
@@ -5,7 +5,6 @@ After=syslog.target network.target
 [Service]
 User=haproxy
 Group=daemon
-WorkingDirectory=/var/lib/haproxy
 PermissionsStartOnly=true
 PIDFile=/var/run/haproxy/kazoo-haproxy.pid
 Environment=HAPROXY_BIN=/usr/sbin/haproxy-systemd-wrapper
diff --git a/system/systemd/kazoo-rabbitmq.service b/system/systemd/kazoo-rabbitmq.service
index 05921b5..9ca6349 100644
--- a/system/systemd/kazoo-rabbitmq.service
+++ b/system/systemd/kazoo-rabbitmq.service
@@ -6,11 +6,9 @@ After=syslog.target network.target
 Type=notify
 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
+ExecStart=/usr/sbin/kazoo-rabbitmq foreground
 ExecStop=/usr/sbin/kazoo-rabbitmq stop
 Restart=on-abort