From 895d3fa8976eae079ccaea80bd53e24e4fc03aad Mon Sep 17 00:00:00 2001 From: k anderson Date: Mon, 13 Jun 2016 09:04:48 -0700 Subject: [PATCH] tweaking sbin scripts --- system/sbin/kazoo-bigcouch | 6 +- system/sbin/kazoo-freeswitch | 10 +++- system/sbin/kazoo-haproxy | 10 +++- system/sbin/kazoo-kamailio | 107 ++++++++++++++++++----------------- system/sbin/kazoo-rabbitmq | 10 +++- 5 files changed, 81 insertions(+), 62 deletions(-) diff --git a/system/sbin/kazoo-bigcouch b/system/sbin/kazoo-bigcouch index dbd6f44..a189b1e 100755 --- a/system/sbin/kazoo-bigcouch +++ b/system/sbin/kazoo-bigcouch @@ -1,5 +1,9 @@ #!/bin/bash +if [ -f /etc/default/bigcouch ]; then + . /etc/default/bigcouch +fi + if [ -f /etc/sysconfig/bigcouch ]; then . /etc/sysconfig/bigcouch fi @@ -29,7 +33,7 @@ start() { if [ "$(whoami)" == "${USER}" ]; then exec ${BIN_FILE} else - exec su ${USER} -s /bin/bash -c "${BIN_FILE}" + exec su -s /bin/bash -c "${BIN_FILE}" ${USER} fi RETVAL=$? } diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch index 2d3d36c..f782d7f 100755 --- a/system/sbin/kazoo-freeswitch +++ b/system/sbin/kazoo-freeswitch @@ -1,5 +1,9 @@ #!/bin/bash +if [ -f /etc/default/freeswitch ]; then + . /etc/default/freeswitch +fi + if [ -f /etc/sysconfig/freeswitch ]; then . /etc/sysconfig/freeswitch fi @@ -26,7 +30,7 @@ start() { if [ "$(whoami)" == "${USER}" ]; then exec ${BIN_FILE} ${FREESWITCH_ARGS} ${FREESWITCH_PARAMS} $@ else - su ${USER} -s /bin/bash -c "exec ${BIN_FILE} ${FREESWITCH_ARGS} ${FREESWITCH_PARAMS} $@" + exec su -s /bin/bash -c "exec ${BIN_FILE} ${FREESWITCH_ARGS} ${FREESWITCH_PARAMS} $@" ${USER} fi RETVAL=$? } @@ -47,11 +51,11 @@ status() { case "$1" in start) shift - start -ncwait $@ + start "-ncwait $@" ;; foreground) shift - start $@ + start "$@" ;; stop) stop diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy index d858558..10fa0e0 100755 --- a/system/sbin/kazoo-haproxy +++ b/system/sbin/kazoo-haproxy @@ -1,5 +1,9 @@ #!/bin/sh +if [ -f /etc/default/haproxy ]; then + . /etc/default/haproxy +fi + if [ -f /etc/sysconfig/haproxy ]; then . /etc/sysconfig/haproxy fi @@ -32,7 +36,7 @@ start() { if [ "$(whoami)" == "${USER}" ]; then exec ${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@ else - exec su ${USER} -s /bin/bash -c "${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@" + exec su -s /bin/bash -c "${BIN_FILE} -f ${CFG_FILE} -p ${PID_FILE} ${OPTIONS} $@" ${USER} fi RETVAL=$? } @@ -123,11 +127,11 @@ status() { case "$1" in start|stop|restart|reload) shift - $1 -D $@ + $1 "-D $@" ;; foreground) shift - start $@ + start "$@" ;; check) check diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index 97454d7..bffa559 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -1,11 +1,11 @@ #!/bin/bash if [ -f /etc/default/kamailio ]; then - . /etc/default/kamailio + . /etc/default/kamailio fi if [ -f /etc/sysconfig/kamailio ]; then - . /etc/sysconfig/kamailio + . /etc/sysconfig/kamailio fi RETVAL=0 @@ -23,80 +23,83 @@ PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) [ $PKG_MEMORY -le 0 ] && PKG_MEMORY=8 if test "$DUMP_CORE" = "yes" ; then - ulimit -c unlimited + ulimit -c unlimited fi # 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 Kamailio: fork=no specified in config file" - exit 1 - fi + if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $CFG_FILE; then + echo "Not starting Kamailio: fork=no specified in config file" + exit 1 + fi } check_kamailio_config () { - local ERRORS=$($BIN_FILE -c 2>&1 > /dev/null) - RETVAL=$? - if [ "${RETVAL}" != '0' ]; then - echo "Not starting Kamailio: invalid configuration file!" - echo -e "\n${ERRORS}\n" - RETVAL=1 - fi + local ERRORS=$($BIN_FILE -c 2>&1 > /dev/null) + RETVAL=$? + if [ "${RETVAL}" != '0' ]; then + echo "Not starting Kamailio: invalid configuration file!" + echo -e "\n${ERRORS}\n" + RETVAL=1 + fi } start() { - check_kamailio_config - check_fork + check_kamailio_config + check_fork - mkdir -p /var/run/kazoo-kamailio - chown -R ${USER} /var/run/kazoo-kamailio - mkdir -p /var/run/kamailio - chown -R ${USER} /var/run/kamailio + mkdir -p /var/run/kazoo-kamailio + chown -R ${USER} /var/run/kazoo-kamailio + mkdir -p /var/run/kamailio + chown -R ${USER} /var/run/kamailio - cd ${HOME} - if [ "$(whoami)" == "${USER}" ]; then - exec ${BIN_FILE} -f ${CFG_FILE} -P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} $@ - else - exec su -s /bin/bash -c "${BIN_FILE} -f ${CFG_FILE} -P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} $@" ${USER} - fi - RETVAL=$? + cd ${HOME} + if [ "$(whoami)" == "${USER}" ]; then + exec ${BIN_FILE} -f ${CFG_FILE} -P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} $@ + else + exec su -s /bin/bash -c "${BIN_FILE} -f ${CFG_FILE} -P ${PID_FILE} -m ${SHM_MEMORY} -M ${PKG_MEMORY} -u ${USER} -g ${GROUP} ${EXTRA_OPTIONS} $@" ${USER} + fi + RETVAL=$? } stop() { - killproc ${BIN_FILE} - RETVAL=$? + killproc ${BIN_FILE} + RETVAL=$? } status() { - kamctl fifo ds_list - RETVAL=$? + kamctl fifo ds_list + RETVAL=$? } case "$1" in - start) - shift - start $@ - ;; - foreground) - shift - start "-DD -E" - ;; - stop) - stop - ;; - status) - status - ;; - restart) - stop - start - ;; - *) - echo $"Usage: $0 {start|stop|restart|status}" - RETVAL=1 + start) + shift + start $@ + ;; + foreground) + shift + start "-DD -E" + ;; + stop) + stop + ;; + check) + check_kamailio_config + ;; + status) + status + ;; + restart) + stop + start + ;; + *) + echo $"Usage: $0 {start|stop|restart|status}" + RETVAL=1 esac exit ${RETVAL} diff --git a/system/sbin/kazoo-rabbitmq b/system/sbin/kazoo-rabbitmq index ebe8be7..859c624 100755 --- a/system/sbin/kazoo-rabbitmq +++ b/system/sbin/kazoo-rabbitmq @@ -1,5 +1,9 @@ #!/bin/bash -e +if [ -f /etc/default/rabbitmq ]; then + . /etc/default/rabbitmq +fi + RETVAL=0 USER=${RABBITMQ_USER-rabbitmq} CFG_FILE=${RABBITMQ_ENV:-/etc/kazoo/rabbitmq/rabbitmq-env.conf} @@ -28,7 +32,7 @@ start() { if [ "$(whoami)" == "${USER}" ]; then exec ${BIN_FILE} $@ else - exec su ${USER} -s /bin/bash -c "${BIN_FILE} $@" + exec su -s /bin/bash -c "${BIN_FILE} $@" ${USER} fi RETVAL=$? } @@ -36,11 +40,11 @@ start() { case "$1" in start) shift - start -detached $@ + start "-detached $@" ;; foreground) shift - start $@ + start "$@" ;; *) exec /usr/lib/rabbitmq/bin/rabbitmqctl $@