From c1546687479b5e396a099a1d985f3cb89e3e7ff6 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Tue, 29 Dec 2015 14:09:36 -0500 Subject: [PATCH] Add sysadm-restserver and sysadm-websocket rc.d files, so we can enable them each on their own --- src/rc.d/{sysadm => sysadm-restserver} | 19 ++++++------ src/rc.d/sysadm-websocket | 42 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 9 deletions(-) rename src/rc.d/{sysadm => sysadm-restserver} (50%) create mode 100755 src/rc.d/sysadm-websocket diff --git a/src/rc.d/sysadm b/src/rc.d/sysadm-restserver similarity index 50% rename from src/rc.d/sysadm rename to src/rc.d/sysadm-restserver index 9aef8b8..e476488 100755 --- a/src/rc.d/sysadm +++ b/src/rc.d/sysadm-restserver @@ -1,32 +1,33 @@ #!/bin/sh # $FreeBSD$ -# PROVIDE: sysadm +# PROVIDE: sysadm-restserver # REQUIRE: LOGIN cleanvar # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable sysadm: -# sysadm_enable (bool): Set to "NO" by default. +# sysadmr_restserver_enable (bool): Set to "NO" by default. # Set it to "YES" to enable sysadm . /etc/rc.subr -name="sysadm" -rcvar=sysadm_enable +name="sysadm_restserver" +rcvar=sysadm_restserver_enable command="/usr/local/bin/sysadm-server" start_cmd="sysadm_start" stop_cmd="sysadm_stop" +flags="" -[ -z "$sysadm_enable" ] && sysadm_enable="NO" +[ -z "$sysadm_restserver_enable" ] && sysadm_restserver_enable="NO" load_rc_config $name sysadm_stop() { - if [ -e "/var/run/sysadm.pid" ] ; then - pkill -9 -F /var/run/sysadm.pid + if [ -e "/var/run/sysadm-rest.pid" ] ; then + pkill -9 -F /var/run/sysadm-rest.pid fi } @@ -34,8 +35,8 @@ sysadm_start() { export PATH="${PATH}:/usr/local/bin:/usr/local/sbin" sysadm_stop - echo "Starting sysadm..." - daemon -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null + echo "Starting sysadm (REST)..." + daemon -p /var/run/sysadm-rest.pid $command $flags >/dev/null 2>/dev/null } run_rc_command "$1" diff --git a/src/rc.d/sysadm-websocket b/src/rc.d/sysadm-websocket new file mode 100755 index 0000000..bd6d959 --- /dev/null +++ b/src/rc.d/sysadm-websocket @@ -0,0 +1,42 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: sysadm_websocket +# REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable sysadm: +# sysadm_websocket_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable sysadm + +. /etc/rc.subr + +name="sysadm_websocket" +rcvar=sysadm_websocket_enable + +command="/usr/local/bin/sysadm-server" +start_cmd="sysadm_start" +stop_cmd="sysadm_stop" +flags="-ws" + +[ -z "$sysadm_websocket_enable" ] && sysadm_websocket_enable="NO" + +load_rc_config $name + +sysadm_stop() +{ + if [ -e "/var/run/sysadm-websocket.pid" ] ; then + pkill -9 -F /var/run/sysadm-websocket.pid + fi +} + +sysadm_start() +{ + export PATH="${PATH}:/usr/local/bin:/usr/local/sbin" + sysadm_stop + echo "Starting sysadm (WebSocket)..." + daemon -p /var/run/sysadm-websocket.pid $command $flags >/dev/null 2>/dev/null +} + +run_rc_command "$1"