summaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2014-02-26 18:00:51 +0000
committerMark Felder <feld@FreeBSD.org>2014-02-26 18:00:51 +0000
commit9643dc9327e1a24b209c1fcad735905f64a6fbec (patch)
treebb37169112eff533d2d082d7441f6d704074d529 /net-mgmt
parentUpdate WWW: homepage has disappeared, but info is still there (diff)
Clean up / simplify rc script.
I have been meaning to solve the following error that used to happen every time you executed the rc script: /usr/local/etc/rc.d/xymon-server: WARNING: cannot read shebang line from su Sponsored by: SupraNet Communications, Inc
Notes
Notes: svn path=/head/; revision=346220
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/xymon-server/Makefile1
-rw-r--r--net-mgmt/xymon-server/files/xymon-server.in12
2 files changed, 6 insertions, 7 deletions
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index f85fdee73cc1..9fb95e6bd15c 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xymon
PORTVERSION= 4.3.17
+PORTREVISION= 1
CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
diff --git a/net-mgmt/xymon-server/files/xymon-server.in b/net-mgmt/xymon-server/files/xymon-server.in
index 562327bf3691..4c50e7e589b9 100644
--- a/net-mgmt/xymon-server/files/xymon-server.in
+++ b/net-mgmt/xymon-server/files/xymon-server.in
@@ -14,15 +14,13 @@ rcvar=xymon_server_enable
load_rc_config "$name"
: ${xymon_server_enable:=NO}
+: ${xymon_server_user:=%%XYMONUSER%%}
-command="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh'"
+command="%%WWWDIR%%/server/xymon.sh"
+command_args="start"
start_precmd=xymon_prestart
-start_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh start'"
-stop_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh stop'"
-status_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh status'"
-reload_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh reload'"
-restart_cmd="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh restart'"
-pidfile=/var/log/xymon/xymond.pid
+pidfile=/var/log/xymon/xymonlaunch.pid
+procname="%%WWWDIR%%/server/bin/xymonlaunch"
xymon_prestart()
{