start in the foreground by default

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}

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}

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}

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}

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}
+exit ${RETVAL}

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}
+exit ${RETVAL}

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
 

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
 

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
 

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}
+exit ${RETVAL}

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}
+exit ${RETVAL}

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
 

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}
+exit ${RETVAL}

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
 

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
+WantedBy=multi-user.target

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
 

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
 

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

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
 

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