Merge branch 'master' of github.com:pcbsd/sysadm

This commit is contained in:
Ken Moore
2016-02-22 12:27:22 -05:00
3 changed files with 27 additions and 27 deletions

View File

@@ -1,3 +1,3 @@
bin/sysadm-server
etc/rc.d/sysadm-restserver
etc/rc.d/sysadm-websocket
etc/rc.d/sysadm
etc/rc.d/sysadm-rest

View File

@@ -1,25 +1,25 @@
#!/bin/sh
# $FreeBSD$
# PROVIDE: sysadm_websocket
# PROVIDE: sysadm
# 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.
# sysadm_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable sysadm
. /etc/rc.subr
name="sysadm_websocket"
rcvar=sysadm_websocket_enable
name="sysadm"
rcvar=sysadm_enable
start_cmd="sysadm_websocket_start"
stop_cmd="sysadm_websocket_stop"
start_cmd="sysadm_start"
stop_cmd="sysadm_stop"
flags="-ws"
[ -z "$sysadm_websocket_enable" ] && sysadm_websocket_enable="NO"
[ -z "$sysadm_enable" ] && sysadm_enable="NO"
load_rc_config $name
@@ -34,22 +34,22 @@ ssl_keygen()
-subj "/C=US/ST=MY/L=NULL/O=SysAdm/OU=SysAdm/CN=SysAdm/emailAddress=none@example.org" 2>/dev/null
}
sysadm_websocket_stop()
sysadm_stop()
{
if [ -e "/var/run/sysadm-websocket.pid" ] ; then
pkill -9 -F /var/run/sysadm-websocket.pid >/dev/null 2>/dev/null
if [ -e "/var/run/sysadm.pid" ] ; then
pkill -9 -F /var/run/sysadm.pid >/dev/null 2>/dev/null
fi
}
sysadm_websocket_start()
sysadm_start()
{
export PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
sysadm_websocket_stop
sysadm_stop
ssl_keygen
echo "Starting sysadm (WebSocket)..."
echo "Starting sysadm..."
command="/usr/local/bin/sysadm-server"
daemon -p /var/run/sysadm-websocket.pid $command $flags >/dev/null 2>/dev/null
chmod 744 /var/run/sysadm-websocket.pid >/dev/null 2>/dev/null
daemon -p /var/run/sysadm.pid $command $flags >/dev/null 2>/dev/null
chmod 744 /var/run/sysadm.pid >/dev/null 2>/dev/null
}
run_rc_command "$1"

View File

@@ -1,25 +1,25 @@
#!/bin/sh
# $FreeBSD$
# PROVIDE: sysadm-restserver
# PROVIDE: sysadm-rest
# REQUIRE: LOGIN cleanvar
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable sysadm:
# sysadmr_restserver_enable (bool): Set to "NO" by default.
# sysadmr_rest_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable sysadm
. /etc/rc.subr
name="sysadm_restserver"
rcvar=sysadm_restserver_enable
name="sysadm_rest"
rcvar=sysadm_rest_enable
start_cmd="sysadm_restserver_start"
stop_cmd="sysadm_restserver_stop"
start_cmd="sysadm_rest_start"
stop_cmd="sysadm_rest_stop"
flags=""
[ -z "$sysadm_restserver_enable" ] && sysadm_restserver_enable="NO"
[ -z "$sysadm_rest_enable" ] && sysadm_rest_enable="NO"
load_rc_config $name
@@ -34,17 +34,17 @@ ssl_keygen()
-subj "/C=US/ST=MY/L=NULL/O=SysAdm/OU=SysAdm/CN=SysAdm/emailAddress=none@example.org" 2>/dev/null
}
sysadm_restserver_stop()
sysadm_rest_stop()
{
if [ -e "/var/run/sysadm-rest.pid" ] ; then
pkill -9 -F /var/run/sysadm-rest.pid >/dev/null 2>/dev/null
fi
}
sysadm_restserver_start()
sysadm_rest_start()
{
export PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
sysadm_restserver_stop
sysadm_rest_stop
ssl_keygen
echo "Starting sysadm (REST)..."
command="/usr/local/bin/sysadm-server"