From 87db3e80478db5e9ce60e1e68d6b47570dd80912 Mon Sep 17 00:00:00 2001 From: bitbashing Date: Wed, 15 Jun 2016 13:02:57 -0700 Subject: [PATCH] standardize pid files and formating --- system/init.d/kazoo-generic.redhat | 1 + system/sbin/kazoo-applications | 9 +++++++-- system/sbin/kazoo-ecallmgr | 9 +++++++-- system/sbin/kazoo-freeswitch | 11 +++++++---- system/sbin/kazoo-haproxy | 8 ++++---- system/sbin/kazoo-rabbitmq | 7 ++++++- system/systemd/kazoo-bigcouch.service | 1 + system/systemd/kazoo-freeswitch.service | 1 + system/systemd/kazoo-kamailio.service | 2 +- system/systemd/kazoo-rabbitmq.service | 1 + 10 files changed, 36 insertions(+), 14 deletions(-) diff --git a/system/init.d/kazoo-generic.redhat b/system/init.d/kazoo-generic.redhat index 022f0a3..42d81c1 100755 --- a/system/init.d/kazoo-generic.redhat +++ b/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 diff --git a/system/sbin/kazoo-applications b/system/sbin/kazoo-applications index 054b8db..1997f6d 100755 --- a/system/sbin/kazoo-applications +++ b/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() { diff --git a/system/sbin/kazoo-ecallmgr b/system/sbin/kazoo-ecallmgr index 2a0e81f..9c865ad 100755 --- a/system/sbin/kazoo-ecallmgr +++ b/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() { diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch index a429350..68d99e0 100755 --- a/system/sbin/kazoo-freeswitch +++ b/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() { diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy index e6bdc95..deda04d 100755 --- a/system/sbin/kazoo-haproxy +++ b/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} } diff --git a/system/sbin/kazoo-rabbitmq b/system/sbin/kazoo-rabbitmq index 11fba08..9be2adc 100755 --- a/system/sbin/kazoo-rabbitmq +++ b/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() { diff --git a/system/systemd/kazoo-bigcouch.service b/system/systemd/kazoo-bigcouch.service index b551c48..5dcf8ce 100644 --- a/system/systemd/kazoo-bigcouch.service +++ b/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 diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service index 4645c57..7fc93f6 100644 --- a/system/systemd/kazoo-freeswitch.service +++ b/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 diff --git a/system/systemd/kazoo-kamailio.service b/system/systemd/kazoo-kamailio.service index ba1b4e2..94fb827 100644 --- a/system/systemd/kazoo-kamailio.service +++ b/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 diff --git a/system/systemd/kazoo-rabbitmq.service b/system/systemd/kazoo-rabbitmq.service index 5f71e5e..05921b5 100644 --- a/system/systemd/kazoo-rabbitmq.service +++ b/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