From 6167484b28abb0e8b78d40c07ce08f703e40e653 Mon Sep 17 00:00:00 2001 From: karl anderson Date: Thu, 29 Sep 2016 11:21:55 -0700 Subject: [PATCH] start in the foreground by default --- system/init.d/kazoo-bigcouch.redhat | 2 +- system/init.d/kazoo-freeswitch.redhat | 2 +- system/init.d/kazoo-generic.redhat | 2 +- system/init.d/kazoo-haproxy.redhat | 2 +- system/init.d/kazoo-kamailio.redhat | 4 ++-- system/init.d/kazoo-rabbitmq.redhat | 4 ++-- system/sbin/kazoo-applications | 6 +++--- system/sbin/kazoo-bigcouch | 4 ++-- system/sbin/kazoo-ecallmgr | 6 +++--- system/sbin/kazoo-freeswitch | 8 ++++---- system/sbin/kazoo-haproxy | 8 ++++---- system/sbin/kazoo-kamailio | 6 +++--- system/sbin/kazoo-rabbitmq | 6 +++--- system/systemd/kazoo-applications.service | 2 +- system/systemd/kazoo-bigcouch.service | 4 ++-- system/systemd/kazoo-ecallmgr.service | 2 +- system/systemd/kazoo-freeswitch.service | 2 +- system/systemd/kazoo-haproxy.service | 2 +- system/systemd/kazoo-kamailio.service | 2 +- system/systemd/kazoo-rabbitmq.service | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/system/init.d/kazoo-bigcouch.redhat b/system/init.d/kazoo-bigcouch.redhat index de76bab..72416a9 100755 --- a/system/init.d/kazoo-bigcouch.redhat +++ b/system/init.d/kazoo-bigcouch.redhat @@ -17,7 +17,7 @@ LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-bigcouch} start() { echo -n $"Starting BigCouch: " /usr/sbin/kazoo-bigcouch prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-bigcouch start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-bigcouch background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} diff --git a/system/init.d/kazoo-freeswitch.redhat b/system/init.d/kazoo-freeswitch.redhat index 2576fd7..4070010 100755 --- a/system/init.d/kazoo-freeswitch.redhat +++ b/system/init.d/kazoo-freeswitch.redhat @@ -27,7 +27,7 @@ start() { fi fi /usr/sbin/kazoo-freeswitch prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-freeswitch start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-freeswitch background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} diff --git a/system/init.d/kazoo-generic.redhat b/system/init.d/kazoo-generic.redhat index dcf591a..09397eb 100755 --- a/system/init.d/kazoo-generic.redhat +++ b/system/init.d/kazoo-generic.redhat @@ -21,7 +21,7 @@ fi start() { echo -n $"Starting ${SCRIPT_NAME}: " /usr/sbin/${SCRIPT_NAME} prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/${SCRIPT_NAME} start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/${SCRIPT_NAME} background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} diff --git a/system/init.d/kazoo-haproxy.redhat b/system/init.d/kazoo-haproxy.redhat index 7394d5a..4e09843 100755 --- a/system/init.d/kazoo-haproxy.redhat +++ b/system/init.d/kazoo-haproxy.redhat @@ -19,7 +19,7 @@ LOCK_FILE=/var/lock/subsys/kazoo-haproxy start() { echo -n $"Starting HAProxy: " /usr/sbin/kazoo-haproxy prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-haproxy start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-haproxy background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} diff --git a/system/init.d/kazoo-kamailio.redhat b/system/init.d/kazoo-kamailio.redhat index 884f280..5273adc 100755 --- a/system/init.d/kazoo-kamailio.redhat +++ b/system/init.d/kazoo-kamailio.redhat @@ -18,7 +18,7 @@ LOCK_FILE=/var/lock/subsys/kazoo-kamailio start() { echo -n $"Starting Kamailio: " /usr/sbin/kazoo-kamailio prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-kamailio start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-kamailio background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} @@ -78,4 +78,4 @@ case "$1" in RETVAL=1 esac -exit ${RETVAL} \ No newline at end of file +exit ${RETVAL} diff --git a/system/init.d/kazoo-rabbitmq.redhat b/system/init.d/kazoo-rabbitmq.redhat index cd7a28e..23735c3 100755 --- a/system/init.d/kazoo-rabbitmq.redhat +++ b/system/init.d/kazoo-rabbitmq.redhat @@ -20,7 +20,7 @@ LOCK_FILE=${LOCK_FILE:-/var/lock/subsys/kazoo-rabbitmq} start() { echo -n $"Starting RabbitMQ: " /usr/sbin/kazoo-rabbitmq prepare >/dev/null 2>&1 - daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-rabbitmq start >/dev/null 2>&1" + daemon --pidfile ${PID_FILE} "/usr/sbin/kazoo-rabbitmq background >/dev/null 2>&1" RETVAL=$? if [ ${RETVAL} -eq 0 ]; then touch ${LOCK_FILE} @@ -77,4 +77,4 @@ case "$1" in RETVAL=1 esac -exit ${RETVAL} \ No newline at end of file +exit ${RETVAL} diff --git a/system/sbin/kazoo-applications b/system/sbin/kazoo-applications index c99b54e..2f48a62 100755 --- a/system/sbin/kazoo-applications +++ b/system/sbin/kazoo-applications @@ -122,10 +122,10 @@ case "$1" in prepare) prepare ;; - start) + background) start "start" ;; - foreground) + start) start "foreground" ;; stop) @@ -150,7 +150,7 @@ case "$1" in pid ;; *) - echo "Usage: $0 (prepare|start|foreground|stop|restart|status|connect|attach|ping|pid)" + echo "Usage: $0 (prepare|start|background|stop|restart|status|connect|attach|ping|pid)" RETVAL=1 esac diff --git a/system/sbin/kazoo-bigcouch b/system/sbin/kazoo-bigcouch index 7833cfd..a0cc170 100755 --- a/system/sbin/kazoo-bigcouch +++ b/system/sbin/kazoo-bigcouch @@ -85,7 +85,7 @@ case "$1" in prepare) prepare ;; - start) + background) start ;; stop) @@ -95,7 +95,7 @@ case "$1" in status ;; *) - echo $"Usage: $0 (prepare|start|stop|restart|status)" + echo $"Usage: $0 (prepare|background|stop|restart|status)" RETVAL=1 esac diff --git a/system/sbin/kazoo-ecallmgr b/system/sbin/kazoo-ecallmgr index d90a327..d903447 100755 --- a/system/sbin/kazoo-ecallmgr +++ b/system/sbin/kazoo-ecallmgr @@ -122,10 +122,10 @@ case "$1" in prepare) prepare ;; - start) + background) start "start" ;; - foreground) + start) start "foreground" ;; stop) @@ -150,7 +150,7 @@ case "$1" in pid ;; *) - echo "Usage: $0 (prepare|start|foreground|stop|restart|status|connect|attach|ping|pid)" + echo "Usage: $0 (prepare|start|background|stop|restart|status|connect|attach|ping|pid)" RETVAL=1 esac diff --git a/system/sbin/kazoo-freeswitch b/system/sbin/kazoo-freeswitch index b1a91f4..0aefbce 100755 --- a/system/sbin/kazoo-freeswitch +++ b/system/sbin/kazoo-freeswitch @@ -87,11 +87,11 @@ case "$1" in prepare) prepare ;; - start) + background) shift start "-ncwait" $@ ;; - foreground) + start) shift start $@ ;; @@ -111,9 +111,9 @@ case "$1" in resume ;; *) - echo "Usage: freeswitch {prepare|start|foreground|stop|restart|status|pause|resume}" + echo "Usage: freeswitch {prepare|start|background|stop|restart|status|pause|resume}" RETVAL=1 ;; esac -exit ${RETVAL} \ No newline at end of file +exit ${RETVAL} diff --git a/system/sbin/kazoo-haproxy b/system/sbin/kazoo-haproxy index bd03722..95241c2 100755 --- a/system/sbin/kazoo-haproxy +++ b/system/sbin/kazoo-haproxy @@ -150,11 +150,11 @@ case "$1" in prepare) prepare ;; - start) + background) shift start "-D $@" ;; - foreground) + start) shift start "$@" ;; @@ -177,8 +177,8 @@ case "$1" in pid ;; *) - echo $"Usage: $0 {prepare|start|foreground|stop|restart|status|reload|check|pid}" + echo $"Usage: $0 {prepare|start|background|stop|restart|status|reload|check|pid}" RETVAL=1 esac -exit ${RETVAL} \ No newline at end of file +exit ${RETVAL} diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index ebdccc3..2411fd0 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -96,11 +96,11 @@ case "$1" in prepare) prepare ;; - start) + background) shift start $@ ;; - foreground) + start) shift start -DD -E $@ ;; @@ -117,7 +117,7 @@ case "$1" in check_config ;; *) - echo $"Usage: $0 {prepare|start|foreground|stop|restart|status|check|pid}" + echo $"Usage: $0 {prepare|start|background|stop|restart|status|check|pid}" RETVAL=1 esac diff --git a/system/sbin/kazoo-rabbitmq b/system/sbin/kazoo-rabbitmq index 5a42f66..92de63b 100755 --- a/system/sbin/kazoo-rabbitmq +++ b/system/sbin/kazoo-rabbitmq @@ -63,11 +63,11 @@ case "$1" in prepare) prepare ;; - start) + background) shift start "-detached" $@ ;; - foreground) + start) shift start "$@" ;; @@ -77,4 +77,4 @@ case "$1" in ;; esac -exit ${RETVAL} \ No newline at end of file +exit ${RETVAL} diff --git a/system/systemd/kazoo-applications.service b/system/systemd/kazoo-applications.service index 34a860c..71c3f8c 100644 --- a/system/systemd/kazoo-applications.service +++ b/system/systemd/kazoo-applications.service @@ -7,7 +7,7 @@ User=kazoo Group=daemon PermissionsStartOnly=true ExecStartPre=/usr/sbin/kazoo-applications prepare -ExecStart=/usr/sbin/kazoo-applications foreground +ExecStart=/usr/sbin/kazoo-applications start ExecStop=/usr/sbin/kazoo-applications stop Restart=on-abort diff --git a/system/systemd/kazoo-bigcouch.service b/system/systemd/kazoo-bigcouch.service index 271d03e..d624f07 100644 --- a/system/systemd/kazoo-bigcouch.service +++ b/system/systemd/kazoo-bigcouch.service @@ -8,9 +8,9 @@ User=bigcouch Group=daemon PermissionsStartOnly=true ExecStartPre=/usr/sbin/kazoo-bigcouch prepare -ExecStart=/usr/sbin/kazoo-bigcouch start +ExecStart=/usr/sbin/kazoo-bigcouch background ExecStop=/usr/sbin/kazoo-bigcouch stop Restart=on-abort [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/system/systemd/kazoo-ecallmgr.service b/system/systemd/kazoo-ecallmgr.service index eab29e4..95ce7e3 100644 --- a/system/systemd/kazoo-ecallmgr.service +++ b/system/systemd/kazoo-ecallmgr.service @@ -7,7 +7,7 @@ User=kazoo Group=daemon PermissionsStartOnly=true ExecStartPre=/usr/sbin/kazoo-ecallmgr prepare -ExecStart=/usr/sbin/kazoo-ecallmgr foreground +ExecStart=/usr/sbin/kazoo-ecallmgr start ExecStop=/usr/sbin/kazoo-ecallmgr stop Restart=on-abort diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service index bb8f019..2910882 100644 --- a/system/systemd/kazoo-freeswitch.service +++ b/system/systemd/kazoo-freeswitch.service @@ -11,7 +11,7 @@ PermissionsStartOnly=true # RuntimeDirectory=/run/freeswitch # RuntimeDirectoryMode=0750 ExecStartPre=/usr/sbin/kazoo-freeswitch prepare -ExecStart=/usr/sbin/kazoo-freeswitch foreground -nc -nf +ExecStart=/usr/sbin/kazoo-freeswitch start -nc -nf ExecReload=/usr/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/system/systemd/kazoo-haproxy.service b/system/systemd/kazoo-haproxy.service index b5ad2d1..32fabcf 100644 --- a/system/systemd/kazoo-haproxy.service +++ b/system/systemd/kazoo-haproxy.service @@ -9,7 +9,7 @@ PermissionsStartOnly=true PIDFile=/var/run/haproxy/kazoo-haproxy.pid Environment=HAPROXY_BIN=/usr/sbin/haproxy-systemd-wrapper ExecStartPre=/usr/sbin/kazoo-haproxy prepare -ExecStart=/usr/sbin/kazoo-haproxy foreground +ExecStart=/usr/sbin/kazoo-haproxy start ExecReload=/bin/kill -USR2 $MAINPID ExecStop=/usr/sbin/kazoo-haproxy stop Restart=on-abort diff --git a/system/systemd/kazoo-kamailio.service b/system/systemd/kazoo-kamailio.service index a8c7698..2863b80 100644 --- a/system/systemd/kazoo-kamailio.service +++ b/system/systemd/kazoo-kamailio.service @@ -7,7 +7,7 @@ User=kamailio Group=daemon PermissionsStartOnly=true ExecStartPre=/usr/sbin/kazoo-kamailio prepare -ExecStart=/usr/sbin/kazoo-kamailio foreground +ExecStart=/usr/sbin/kazoo-kamailio start ExecStop=/usr/sbin/kazoo-kamailio stop Restart=on-abort diff --git a/system/systemd/kazoo-rabbitmq.service b/system/systemd/kazoo-rabbitmq.service index 9ca6349..77df434 100644 --- a/system/systemd/kazoo-rabbitmq.service +++ b/system/systemd/kazoo-rabbitmq.service @@ -8,7 +8,7 @@ User=rabbitmq Group=daemon PermissionsStartOnly=true ExecStartPre=/usr/sbin/kazoo-rabbitmq prepare -ExecStart=/usr/sbin/kazoo-rabbitmq foreground +ExecStart=/usr/sbin/kazoo-rabbitmq start ExecStop=/usr/sbin/kazoo-rabbitmq stop Restart=on-abort