diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2011-04-02 14:26:29 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2011-04-02 14:26:29 +0000 |
| commit | b186994037f56335d82c9c1d0e76ae7e908b375a (patch) | |
| tree | 55abb7f0a49ea893249c9cfda4ef4a589ec834c2 /net-mgmt | |
| parent | 13e80002a375ec338b4c50370027818aca1aef84 (diff) | |
| download | ports-b186994037f56335d82c9c1d0e76ae7e908b375a.tar.gz ports-b186994037f56335d82c9c1d0e76ae7e908b375a.zip | |
Notes
Diffstat (limited to 'net-mgmt')
22 files changed, 591 insertions, 475 deletions
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile index 95fcc1d17c4a..4d49fdd384a0 100644 --- a/net-mgmt/xymon-client/Makefile +++ b/net-mgmt/xymon-client/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xymon -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -client${PKGNAMESUFFIX2} @@ -18,29 +17,29 @@ COMMENT= System for monitoring servers and networks - Client LICENSE= GPLv2 # Options -BBUSER?= hobbit -BBHOSTIP?= 127.0.0.1 +XYMONUSER?= xymon +XYMONHOSTIP?= 127.0.0.1 USE_GMAKE= yes CONFIGURE_ENV= MAKE=gmake -MAKE_ENV+= BBUSER="${BBUSER}" -MAKE_ENV+= BBHOSTIP="${BBHOSTIP}" -USE_RC_SUBR= hobbit-client.sh -PLIST_SUB+= BBUSER="${BBUSER}" -CONFIG_FILES= clientlaunch.cfg hobbitclient.cfg localclient.cfg +MAKE_ENV+= XYMONUSER="${XYMONUSER}" +MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" +USE_RC_SUBR= xymon-client.sh +PLIST_SUB+= XYMONUSER="${XYMONUSER}" +CONFIG_FILES= clientlaunch.cfg xymonclient.cfg localclient.cfg # Configure script is interactive do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ pre-install: - if ! pw groupshow ${BBUSER}; then pw groupadd ${BBUSER} -g 280; fi - if ! pw usershow ${BBUSER}; then pw useradd ${BBUSER} -g ${BBUSER} -u 280 \ - -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Hobbit Monitor"; fi + if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi + if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \ + -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi post-install: .for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/client/etc/${i}-dist \ + ${CP} -np ${WWWDIR}/client/etc/${i}.DIST \ ${WWWDIR}/client/etc/${i} .endfor diff --git a/net-mgmt/xymon-client/distinfo b/net-mgmt/xymon-client/distinfo index 648282e6e0bd..424d5c32dc99 100644 --- a/net-mgmt/xymon-client/distinfo +++ b/net-mgmt/xymon-client/distinfo @@ -1,2 +1,2 @@ -SHA256 (xymon-4.2.3.tar.gz) = c56f7a168e32f7326fa659fec481a83ad4632bd8986462f78a2d5fbd0c18990f -SIZE (xymon-4.2.3.tar.gz) = 2313567 +SHA256 (xymon-4.3.0.tar.gz) = d9243f9ff9710fec0ffbf752980967f376794ca986fd7e650231b332f621f2ea +SIZE (xymon-4.3.0.tar.gz) = 2679880 diff --git a/net-mgmt/xymon-client/files/Makefile b/net-mgmt/xymon-client/files/Makefile index b143241db438..f4162b2ed59a 100644 --- a/net-mgmt/xymon-client/files/Makefile +++ b/net-mgmt/xymon-client/files/Makefile @@ -1,22 +1,22 @@ -# Toplevel Makefile for Hobbit +# Toplevel Makefile for Xymon # $FreeBSD$ BUILDTOPDIR=`pwd` CLIENTONLY = yes LOCALCLIENT = no -# configure settings for Hobbit +# configure settings for Xymon # # Toplevel dir -BBTOPDIR = ${PREFIX}/www/xymon +XYMONTOPDIR = ${PREFIX}/www/xymon # Server home dir for etc/, www/ -BBHOME = ${PREFIX}/www/xymon/client +XYMONHOME = ${PREFIX}/www/xymon/client # hobbit settings follows # # Username running hobbit -#BBUSER = nobody -# Hobbit server IP-address -#BBHOSTIP = 127.0.0.1 +#XYMONUSER = nobody +# Xymon server IP-address +#XYMONHOSTIP = 127.0.0.1 # Large File Support settings LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/net-mgmt/xymon-client/files/hobbit-client.sh.in b/net-mgmt/xymon-client/files/hobbit-client.sh.in deleted file mode 100644 index 7ae6ddf9ce5a..000000000000 --- a/net-mgmt/xymon-client/files/hobbit-client.sh.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: hobbit_client -# REQUIRE: DAEMON - -. /etc/rc.subr - -name="hobbit_client" -rcvar=`set_rcvar` - -load_rc_config "$name" -: ${hobbit_client_enable:="NO"} -: ${hobbit_client_flags:=""} - -command="%%PREFIX%%/www/xymon/client/runclient.sh" -start_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} start" -stop_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} stop" -status_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} status" -reload_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${hobbit_client_flags} restart" -pidfile="%%PREFIX%%/www/xymon/client/logs/clientlaunch.`hostname`.pid" - -run_rc_command "$1" -# eof diff --git a/net-mgmt/xymon-client/files/patch-Makefile b/net-mgmt/xymon-client/files/patch-Makefile index 77d6d6045367..7c8adbdcbcc9 100644 --- a/net-mgmt/xymon-client/files/patch-Makefile +++ b/net-mgmt/xymon-client/files/patch-Makefile @@ -1,18 +1,19 @@ ---- client/Makefile.orig 2006-08-09 22:09:58.000000000 +0200 -+++ client/Makefile 2008-01-28 12:01:34.000000000 +0100 -@@ -63,12 +63,12 @@ - if test ! -d $(INSTALLROOT)$(BBHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(BBHOME)/tmp ; fi - if test ! -d $(INSTALLROOT)$(BBHOME)/logs; then mkdir -p $(INSTALLROOT)$(BBHOME)/logs; fi - if test ! -d $(INSTALLROOT)$(BBHOME)/ext ; then mkdir -p $(INSTALLROOT)$(BBHOME)/ext ; fi -- if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/ ; fi -+ if test ! -f $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(BBHOME)/etc/localclient.cfg-dist ; fi - cp -fp runclient.sh $(INSTALLROOT)$(BBHOME) - cp -fp $(PROGRAMS) hobbitclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(BBHOME)/bin/ +--- client/Makefile.orig 2011-03-04 11:01:25.000000000 +0100 ++++ client/Makefile 2011-03-31 08:03:39.000000000 +0200 +@@ -63,13 +63,13 @@ + if test ! -d $(INSTALLROOT)$(XYMONHOME)/tmp ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/tmp ; fi + if test ! -d $(INSTALLROOT)$(XYMONHOME)/logs; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/logs; fi + if test ! -d $(INSTALLROOT)$(XYMONHOME)/ext ; then mkdir -p $(INSTALLROOT)$(XYMONHOME)/ext ; fi +- if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/ ; fi ++ if test ! -f $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg ; then cp localclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/localclient.cfg.DIST ; fi + cp -fp runclient.sh $(INSTALLROOT)$(XYMONHOME) + cp -fp $(PROGRAMS) xymonclient*.sh $(COMMONTOOLS) $(EXTRATOOLS) $(INSTALLROOT)$(XYMONHOME)/bin/ + chmod ugo+x $(INSTALLROOT)$(XYMONHOME)/bin/* -- ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg -- ../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg -+ ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(BBHOME)/etc/clientlaunch.cfg-dist -+ ../build/merge-lines hobbitclient.cfg $(INSTALLROOT)$(BBHOME)/etc/hobbitclient.cfg-dist +- ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg +- ../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg ++ ../build/merge-sects clientlaunch.cfg $(INSTALLROOT)$(XYMONHOME)/etc/clientlaunch.cfg.DIST ++ ../build/merge-lines xymonclient.cfg $(INSTALLROOT)$(XYMONHOME)/etc/xymonclient.cfg.DIST ifndef PKGBUILD - chown -R $(BBUSER) $(INSTALLROOT)$(BBHOME) + chown -R $(XYMONUSER) $(INSTALLROOT)$(XYMONHOME) endif diff --git a/net-mgmt/xymon-client/files/patch-hobbitclient-freebsd.sh b/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh index 047721ed0da8..e121274bc4b3 100644 --- a/net-mgmt/xymon-client/files/patch-hobbitclient-freebsd.sh +++ b/net-mgmt/xymon-client/files/patch-xymonclient-freebsd.sh @@ -1,6 +1,6 @@ ---- client/hobbitclient-freebsd.sh.orig 2006-07-05 07:52:22.000000000 +0200 -+++ client/hobbitclient-freebsd.sh 2010-07-09 09:37:22.000000000 +0200 -@@ -41,7 +41,7 @@ +--- client/xymonclient-freebsd.sh.orig 2010-11-14 18:21:19.000000000 +0100 ++++ client/xymonclient-freebsd.sh 2011-03-31 06:52:18.000000000 +0200 +@@ -43,7 +43,7 @@ echo "[netstat]" netstat -s echo "[ports]" diff --git a/net-mgmt/xymon-client/files/xymon-client.sh.in b/net-mgmt/xymon-client/files/xymon-client.sh.in new file mode 100644 index 000000000000..2cafdc67c758 --- /dev/null +++ b/net-mgmt/xymon-client/files/xymon-client.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: xymon_client +# REQUIRE: DAEMON + +. /etc/rc.subr + +name="xymon_client" +rcvar=`set_rcvar` + +load_rc_config "$name" +: ${xymon_client_enable:="NO"} +: ${xymon_client_flags:=""} + +command="%%PREFIX%%/www/xymon/client/runclient.sh" +start_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} start" +stop_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} stop" +status_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} status" +reload_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} restart" +pidfile="%%PREFIX%%/www/xymon/client/logs/clientlaunch.`hostname`.pid" + +run_rc_command "$1" +# eof diff --git a/net-mgmt/xymon-client/pkg-descr b/net-mgmt/xymon-client/pkg-descr index 58d7e81c58aa..ff6ea7718748 100644 --- a/net-mgmt/xymon-client/pkg-descr +++ b/net-mgmt/xymon-client/pkg-descr @@ -1,17 +1,17 @@ -Hobbit is a system for monitoring servers and networks. It has a great deal +Xymon is a system for monitoring servers and networks. It has a great deal of inspiration from the Big Brother monitor, but unlike Big Brother it is designed to work well whether you need to monitor small network with just a handful of hosts, or large networks with thousands of hosts. -Hobbit is the successor to the bbgen toolkit, which has been available as +Xymon is the successor to the bbgen toolkit, which has been available as an add-on to Big Brother since late 2002. The name change was decided upon -when Hobbit acquired enough functionality to be a stand-alone product. -The tools that formed the bbgen toolkit are still present in Hobbit +when Xymon acquired enough functionality to be a stand-alone product. +The tools that formed the bbgen toolkit are still present in Xymon and are quite important for it, so if you have used bbgen before, -Hobbit will seem quite familiar. +Xymon will seem quite familiar. This is the client. LICENSE: GPL2 or later -WWW: http://hobbitmon.sourceforge.net/ +WWW: http://xymon.sourceforge.net/ diff --git a/net-mgmt/xymon-client/pkg-plist b/net-mgmt/xymon-client/pkg-plist index 4db73c450cfa..a9c0d0a79de9 100644 --- a/net-mgmt/xymon-client/pkg-plist +++ b/net-mgmt/xymon-client/pkg-plist @@ -1,45 +1,46 @@ -@exec if ! pw groupshow %%BBUSER%% 2>/dev/null; then pw groupadd %%BBUSER%% -g 280; fi -@exec if ! pw usershow %%BBUSER%% 2>/dev/null; then pw useradd %%BBUSER%% -g %%BBUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Hobbit Monitor"; fi -@unexec if pw usershow %%BBUSER%%; then pw userdel %%BBUSER%%; fi -%%WWWDIR%%/client/bin/bb -%%WWWDIR%%/client/bin/bbcmd -%%WWWDIR%%/client/bin/bbdigest -%%WWWDIR%%/client/bin/bbhostgrep -%%WWWDIR%%/client/bin/bbhostshow +@exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi +@exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi +@unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi %%WWWDIR%%/client/bin/clientupdate %%WWWDIR%%/client/bin/freebsd-meminfo -%%WWWDIR%%/client/bin/hobbitclient-aix.sh -%%WWWDIR%%/client/bin/hobbitclient-darwin.sh -%%WWWDIR%%/client/bin/hobbitclient-freebsd.sh -%%WWWDIR%%/client/bin/hobbitclient-hp-ux.sh -%%WWWDIR%%/client/bin/hobbitclient-irix.sh -%%WWWDIR%%/client/bin/hobbitclient-linux.sh -%%WWWDIR%%/client/bin/hobbitclient-netbsd.sh -%%WWWDIR%%/client/bin/hobbitclient-openbsd.sh -%%WWWDIR%%/client/bin/hobbitclient-osf1.sh -%%WWWDIR%%/client/bin/hobbitclient-sco_sv.sh -%%WWWDIR%%/client/bin/hobbitclient-sunos.sh -%%WWWDIR%%/client/bin/hobbitclient.sh -%%WWWDIR%%/client/bin/hobbitlaunch +%%WWWDIR%%/client/bin/orcaxymon +%%WWWDIR%%/client/bin/xymon +%%WWWDIR%%/client/bin/xymoncfg +%%WWWDIR%%/client/bin/xymonclient-aix.sh +%%WWWDIR%%/client/bin/xymonclient-darwin.sh +%%WWWDIR%%/client/bin/xymonclient-freebsd.sh +%%WWWDIR%%/client/bin/xymonclient-hp-ux.sh +%%WWWDIR%%/client/bin/xymonclient-irix.sh +%%WWWDIR%%/client/bin/xymonclient-linux.sh +%%WWWDIR%%/client/bin/xymonclient-netbsd.sh +%%WWWDIR%%/client/bin/xymonclient-openbsd.sh +%%WWWDIR%%/client/bin/xymonclient-osf1.sh +%%WWWDIR%%/client/bin/xymonclient-sco_sv.sh +%%WWWDIR%%/client/bin/xymonclient-sunos.sh +%%WWWDIR%%/client/bin/xymonclient-unixware.sh +%%WWWDIR%%/client/bin/xymonclient.sh +%%WWWDIR%%/client/bin/xymoncmd +%%WWWDIR%%/client/bin/xymondigest +%%WWWDIR%%/client/bin/xymongrep +%%WWWDIR%%/client/bin/xymonlaunch %%WWWDIR%%/client/bin/logfetch %%WWWDIR%%/client/bin/msgcache -%%WWWDIR%%/client/bin/orcahobbit -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/clientlaunch.cfg %D/%%WWWDIR%%/client/etc/clientlaunch.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/clientlaunch.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/hobbitclient.cfg %D/%%WWWDIR%%/client/etc/hobbitclient.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/hobbitclient.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/client/etc/localclient.cfg %D/%%WWWDIR%%/client/etc/localclient.cfg-dist; then rm -f %D/%%WWWDIR%%/client/etc/localclient.cfg; fi -%%WWWDIR%%/client/etc/clientlaunch.cfg-dist +@unexec if cmp -s %D/%%WWWDIR%%/client/etc/clientlaunch.cfg %D/%%WWWDIR%%/client/etc/clientlaunch.cfg.DIST; then rm -f %D/%%WWWDIR%%/client/etc/clientlaunch.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/client/etc/xymonclient.cfg %D/%%WWWDIR%%/client/etc/xymonclient.cfg.DIST; then rm -f %D/%%WWWDIR%%/client/etc/xymonclient.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/client/etc/localclient.cfg %D/%%WWWDIR%%/client/etc/localclient.cfg.DIST; then rm -f %D/%%WWWDIR%%/client/etc/localclient.cfg; fi +%%WWWDIR%%/client/etc/clientlaunch.cfg.DIST @exec [ ! -f %B/clientlaunch.cfg ] && cp %B/%f %B/clientlaunch.cfg -%%WWWDIR%%/client/etc/hobbitclient.cfg-dist -@exec [ ! -f %B/hobbitclient.cfg ] && cp %B/%f %B/hobbitclient.cfg -%%WWWDIR%%/client/etc/localclient.cfg-dist +%%WWWDIR%%/client/etc/xymonclient.cfg.DIST +@exec [ ! -f %B/xymonclient.cfg ] && cp %B/%f %B/xymonclient.cfg +%%WWWDIR%%/client/etc/localclient.cfg.DIST @exec [ ! -f %B/localclient.cfg ] && cp %B/%f %B/localclient.cfg %%WWWDIR%%/client/runclient.sh @exec mkdir %D/%%WWWDIR%%/client/ext @exec mkdir %D/%%WWWDIR%%/client/logs @exec mkdir %D/%%WWWDIR%%/client/tmp -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/ext -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/logs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/client/tmp +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/ext +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/logs +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/client/tmp @dirrm %%WWWDIR%%/client/tmp @dirrm %%WWWDIR%%/client/logs @dirrm %%WWWDIR%%/client/ext diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile index 20bb2fb4b671..10611568ed0c 100644 --- a/net-mgmt/xymon-server/Makefile +++ b/net-mgmt/xymon-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xymon -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= net-mgmt www MASTER_SITES= SF/xymon/Xymon/${PORTVERSION} PKGNAMESUFFIX= -server${PKGNAMESUFFIX2} @@ -24,72 +23,84 @@ LICENSE= GPLv2 MAKE_JOBS_UNSAFE= yes # Options -BBUSER?= hobbit -BBHOSTNAME?= hobbit.example.com -BBHOSTIP?= 127.0.0.1 +XYMONUSER?= xymon +XYMONHOSTNAME?= xymon.example.com +XYMONHOSTIP?= 127.0.0.1 USE_GMAKE= yes USE_OPENSSL= yes CONFIGURE_ENV= MAKE=gmake -MAKE_ENV+= BBUSER="${BBUSER}" -MAKE_ENV+= BBHOSTNAME="${BBHOSTNAME}" -MAKE_ENV+= BBHOSTIP="${BBHOSTIP}" -USE_RC_SUBR= hobbit-server.sh -SUB_LIST+= BBUSER="${BBUSER}" -PLIST_SUB+= BBUSER="${BBUSER}" VARBASE="/var" - -CONFIG_FILES= bb-hosts bb-services bbcombotest.cfg client-local.cfg \ - columndoc.csv hobbit-alerts.cfg hobbit-apache.conf \ - hobbit-clients.cfg hobbitcgi.cfg hobbitgraph.cfg \ - hobbitlaunch.cfg hobbitserver.cfg -FIXME1= bb-hosts hobbit-alerts.cfg hobbit-clients.cfg bbcombotest.cfg - -MAN1 = bb-ack.cgi.1 bb-csvinfo.cgi.1 bb-datepage.cgi.1 bb-eventlog.cgi.1 \ - bb-findhost.cgi.1 bb-hist.cgi.1 bb-rep.cgi.1 bb-replog.cgi.1 \ - bb-snapshot.cgi.1 bb-webpage.cgi.1 bb.1 bbcmd.1 bbcombotest.1 bbdigest.1 \ - bbgen.1 bbhostgrep.1 bbhostshow.1 bbretest-net.sh.1 bbtest-net.1 \ - clientupdate.1 hobbit-ackinfo.cgi.1 hobbit-confreport.cgi.1 \ - hobbit-ghosts.cgi.1 hobbit-hostgraphs.cgi.1 hobbit-nkedit.cgi.1 \ - hobbit-nkview.cgi.1 hobbit-statusreport.cgi.1 hobbitgraph.cgi.1 \ - hobbitping.1 hobbitsvc.cgi.1 logfetch.1 orcahobbit.1 -MAN5= bb-hosts.5 bb-services.5 bbcombotest.cfg.5 client-local.cfg.5 \ - clientlaunch.cfg.5 hobbit-alerts.cfg.5 hobbit-clients.cfg.5 \ - hobbit-nkview.cfg.5 hobbitcgi.cfg.5 hobbitclient.cfg.5 \ - hobbitgraph.cfg.5 hobbitlaunch.cfg.5 hobbitserver.cfg.5 hobbitweb.5 +MAKE_ENV+= XYMONUSER="${XYMONUSER}" +MAKE_ENV+= XYMONHOSTNAME="${XYMONHOSTNAME}" +MAKE_ENV+= XYMONHOSTIP="${XYMONHOSTIP}" +USE_RC_SUBR= xymon-server.sh +SUB_LIST+= XYMONUSER="${XYMONUSER}" +PLIST_SUB+= XYMONUSER="${XYMONUSER}" VARBASE="/var" + +CONFIG_FILES= alerts.cfg analysis.cfg cgioptions.cfg client-local.cfg \ + columndoc.csv combo.cfg graphs.cfg holidays.cfg protocols.cfg \ + rrddefinitions.cfg tasks.cfg xymonserver.cfg +FIXME1= alerts.cfg hosts.cfg xymon-apache-open xymon-apache-secure +FIXME2= analysis.cfg combo.cfg holidays.cfg rrddefinitions.cfg \ + snmpmibs.cfg xymonmenu.cfg xymonserver-migration.cfg + +MAN1 = ackinfo.cgi.1 acknowledge.cgi.1 clientupdate.1 combostatus.1 \ + confreport.cgi.1 criticaleditor.cgi.1 criticalview.cgi.1 \ + csvinfo.cgi.1 datepage.cgi.1 eventlog.cgi.1 findhost.cgi.1 \ + ghostlist.cgi.1 history.cgi.1 hostgraphs.cgi.1 logfetch.1 \ + orcaxymon.1 report.cgi.1 reportlog.cgi.1 showgraph.cgi.1 \ + snapshot.cgi.1 statusreport.cgi.1 svcstatus.cgi.1 xymon.1 xymoncfg.1 \ + xymoncmd.1 xymondigest.1 xymongen.1 xymongrep.1 xymonnet-again.sh.1 \ + xymonnet.1 xymonpage.cgi.1 xymonping.1 +MAN5= alerts.cfg.5 analysis.cfg.5 cgioptions.cfg.5 client-local.cfg.5 \ + clientlaunch.cfg.5 combo.cfg.5 critical.cfg.5 graphs.cfg.5 \ + hosts.cfg.5 protocols.cfg.5 tasks.cfg.5 xymon-xmh.5 \ + xymonclient.cfg.5 xymonserver.cfg.5 xymonweb.5 MAN7= xymon.7 -MAN8= bbmessage.cgi.8 bbproxy.8 hobbit-enadis.cgi.8 hobbit-mailack.8 \ - hobbitd.8 hobbitd_alert.8 hobbitd_channel.8 hobbitd_client.8 \ - hobbitd_filestore.8 hobbitd_history.8 hobbitd_hostdata.8 \ - hobbitd_rrd.8 hobbitd_sample.8 hobbitfetch.8 hobbitlaunch.8 \ - msgcache.8 trimhistory.8 +MAN8= enadis.cgi.8 xymon-mailack.8 xymoncgimsg.cgi.8 xymond.8 \ + xymond_alert.8 xymond_capture.8 xymond_channel.8 xymond_client.8 \ + xymond_filestore.8 xymond_history.8 xymond_hostdata.8 xymond_rrd.8 \ + xymond_sample.8 xymonfetch.8 xymonlaunch.8 xymonproxy.8 msgcache.8 \ + trimhistory.8 + +.include <bsd.port.pre.mk> .if defined(WITH_LDAP) MAKE_ENV+= WITH_LDAP=1 USE_OPENLDAP= yes .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= does not compile on 6.X +.if defined(WITH_NETSNMP) +MAKE_ENV+= WITH_NETSNMP=1 +LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp .endif + +post-patch: + ${REINPLACE_CMD} -e 's|!/bin/bash|!/usr/local/bin/bash|' \ + ${WRKSRC}/xymond/xymonreports.sh.DIST + # Configure script is interactive do-configure: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ pre-install: - if ! pw groupshow ${BBUSER}; then pw groupadd ${BBUSER} -g 280; fi - if ! pw usershow ${BBUSER}; then pw useradd ${BBUSER} -g ${BBUSER} -u 280 \ - -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Hobbit Monitor"; fi + if ! pw groupshow ${XYMONUSER}; then pw groupadd ${XYMONUSER} -g 280; fi + if ! pw usershow ${XYMONUSER}; then pw useradd ${XYMONUSER} -g ${XYMONUSER} -u 280 \ + -h - -d ${WWWDIR} -s /usr/sbin/nologin -c "Xymon Monitor"; fi post-install: -${MKDIR} ${WWWDIR}/server/etc + ${INSTALL_SCRIPT} ${WRKSRC}/build/upgrade430.sh ${WWWDIR}/server/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/build/renamevars ${WWWDIR}/server/bin/ .for i in ${FIXME1} - ${INSTALL_DATA} ${WRKSRC}/hobbitd/etcfiles/${i} ${WWWDIR}/server/etc/${i}-dist + ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i}.DIST ${WWWDIR}/server/etc/ +.endfor +.for i in ${FIXME2} + ${INSTALL_DATA} ${WRKSRC}/xymond/etcfiles/${i} ${WWWDIR}/server/etc/${i}.DIST .endfor .for i in ${CONFIG_FILES} - ${CP} -np ${WWWDIR}/server/etc/${i}-dist \ + ${CP} -np ${WWWDIR}/server/etc/${i}.DIST \ ${WWWDIR}/server/etc/${i} .endfor diff --git a/net-mgmt/xymon-server/distinfo b/net-mgmt/xymon-server/distinfo index 648282e6e0bd..424d5c32dc99 100644 --- a/net-mgmt/xymon-server/distinfo +++ b/net-mgmt/xymon-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (xymon-4.2.3.tar.gz) = c56f7a168e32f7326fa659fec481a83ad4632bd8986462f78a2d5fbd0c18990f -SIZE (xymon-4.2.3.tar.gz) = 2313567 +SHA256 (xymon-4.3.0.tar.gz) = d9243f9ff9710fec0ffbf752980967f376794ca986fd7e650231b332f621f2ea +SIZE (xymon-4.3.0.tar.gz) = 2679880 diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile index 8b6d061bf1ed..cc2aa8c3ba88 100644 --- a/net-mgmt/xymon-server/files/Makefile +++ b/net-mgmt/xymon-server/files/Makefile @@ -1,41 +1,41 @@ -# Toplevel Makefile for Hobbit +# Toplevel Makefile for Xymon # $FreeBSD$ BUILDTOPDIR=`pwd` -# configure settings for Hobbit +# configure settings for Xymon # # Toplevel dir -BBTOPDIR = ${PREFIX}/www/xymon +XYMONTOPDIR = ${PREFIX}/www/xymon # Server home dir for etc/, bin/ -BBHOME = ${PREFIX}/www/xymon/server +XYMONHOME = ${PREFIX}/www/xymon/server # Server data dir for hist/ etc. -BBVAR = ${PREFIX}/www/xymon/data +XYMONVAR = ${PREFIX}/www/xymon/data # CGI scripts go in CGIDIR CGIDIR = ${PREFIX}/www/xymon/cgi-bin # Admin CGI scripts go in SECURECGIDIR SECURECGIDIR = ${PREFIX}/www/xymon/cgi-secure # Where to put logfiles -BBLOGDIR = /var/log/hobbit +XYMONLOGDIR = /var/log/xymon # Where to install manpages MANROOT = ${PREFIX}/man -# How to run fping or hobbitping -FPING = hobbitping +# How to run fping or xymonping +FPING = xymonping -# Username running hobbit -#BBUSER = nobody -# Hobbit server hostname -#BBHOSTNAME = hobbit.example.com -# Hobbit server IP-address -#BBHOSTIP = 127.0.0.1 -# Hobbit server OS -BBHOSTOS = freebsd +# Username running xymon +#XYMONUSER = nobody +# Xymon server hostname +#XYMONHOSTNAME = xymon.example.com +# Xymon server IP-address +#XYMONHOSTIP = 127.0.0.1 +# Xymon server OS +XYMONHOSTOS = freebsd -# URL for Hobbit webpages -BBHOSTURL = /hobbit -# URL for Hobbit CGIs -BBCGIURL = /hobbit-cgi -# URL for Hobbit Admin CGIs -SECUREBBCGIURL = /hobbit-seccgi +# URL for Xymon webpages +XYMONHOSTURL = /xymon +# URL for Xymon CGIs +XYMONCGIURL = /xymon-cgi +# URL for Xymon Admin CGIs +SECUREXYMONCGIURL = /xymon-seccgi # Webserver group-ID HTTPDGID=80 @@ -51,19 +51,28 @@ PCRELIBS = -L${LOCALBASE}/lib -lpcre RPATHVAL += ${LOCALBASE}/lib # # OpenSSL settings -SSLFLAGS = -DBBGEN_SSL +SSLFLAGS = -DHAVE_OPENSSL=1 SSLINCDIR = -I${OPENSSLINC} SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto RPATHVAL += ${OPENSSLLIB} # ifdef WITH_LDAP # OpenLDAP settings -LDAPFLAGS = -DBBGEN_LDAP -DBBGEN_LDAP_USESTARTTLS +LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS LDAPINCDIR = -I${PREFIX}/include LDAPLIBS = -L${PREFIX}/lib -lldap -llber RPATHVAL += ${PREFIX}/lib endif -# +# clock_gettime() settings +LIBRTDEF = + +ifdef WITH_NETSNMP +# Net-SNMP settings +DOSNMP = yes +else +DOSNMP = no +endif + # Large File Support settings LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/net-mgmt/xymon-server/files/hobbit-server.sh.in b/net-mgmt/xymon-server/files/hobbit-server.sh.in deleted file mode 100644 index 796dbb4c393b..000000000000 --- a/net-mgmt/xymon-server/files/hobbit-server.sh.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: hobbit_server -# REQUIRE: DAEMON - -. /etc/rc.subr - -name="hobbit_server" -rcvar=`set_rcvar` - -load_rc_config "$name" -: ${hobbit_server_enable:="NO"} - -command="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh'" -start_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh start'" -stop_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh stop'" -status_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh status'" -reload_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh reload'" -restart_cmd="su -m %%BBUSER%% -c '%%PREFIX%%/www/xymon/server/hobbit.sh restart'" -pidfile="/var/log/hobbit/hobbitd.pid" - -run_rc_command "$1" -# eof diff --git a/net-mgmt/xymon-server/files/patch-bbnet-Makefile b/net-mgmt/xymon-server/files/patch-bbnet-Makefile deleted file mode 100644 index 251c026d5702..000000000000 --- a/net-mgmt/xymon-server/files/patch-bbnet-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- bbnet/Makefile.orig 2006-08-09 22:09:56.000000000 +0200 -+++ bbnet/Makefile 2008-01-28 16:08:57.000000000 +0100 -@@ -88,8 +88,8 @@ - cp -fp $(EXTENSIONS) $(INSTALLROOT)$(INSTALLEXTDIR)/ - - install-config: -- ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/bb-services -- ../build/merge-sects bb-services $(INSTALLROOT)$(INSTALLETCDIR)/bb-services -+ ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/bb-services-dist -+ ../build/merge-sects bb-services $(INSTALLROOT)$(INSTALLETCDIR)/bb-services-dist - - install-man: - mkdir -p $(INSTALLROOT)$(MANROOT)/man1 $(INSTALLROOT)$(MANROOT)/man5 diff --git a/net-mgmt/xymon-server/files/patch-build-Makefile.rules b/net-mgmt/xymon-server/files/patch-build-Makefile.rules index 6a0dc2fe8f68..e8114694713b 100644 --- a/net-mgmt/xymon-server/files/patch-build-Makefile.rules +++ b/net-mgmt/xymon-server/files/patch-build-Makefile.rules @@ -1,15 +1,15 @@ ---- build/Makefile.rules.orig 2006-08-09 22:09:57.000000000 +0200 -+++ build/Makefile.rules 2008-01-24 14:12:36.000000000 +0100 +--- build/Makefile.rules.orig 2011-02-14 12:00:30.000000000 +0100 ++++ build/Makefile.rules 2011-03-31 07:16:54.000000000 +0200 @@ -22,9 +22,9 @@ INSTALLTARGETS = install-client install-clientmsg endif else -- BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build client +- BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build client - CLIENTTARGETS = lib-client common-client build-build -- INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-client install-servermsg -+ BUILDTARGETS = lib-build common-build bbdisplay-build bbnet-build bbproxy-build docs-build build-build hobbitd-build web-build +- INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-client install-servermsg ++ BUILDTARGETS = lib-build common-build xymongen-build xymonnet-build xymonproxy-build docs-build build-build xymond-build web-build + CLIENTTARGETS = -+ INSTALLTARGETS = install-bbdisplay install-bbnet install-bbproxy install-man install-hobbitd install-web install-docs install-servermsg ++ INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-man install-xymond install-web install-docs install-servermsg CFLAGS += $(PCREINCDIR) endif diff --git a/net-mgmt/xymon-server/files/patch-hobbitd-Makefile b/net-mgmt/xymon-server/files/patch-hobbitd-Makefile deleted file mode 100644 index 9e2089769b31..000000000000 --- a/net-mgmt/xymon-server/files/patch-hobbitd-Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- hobbitd/Makefile.orig 2006-08-09 22:10:05.000000000 +0200 -+++ hobbitd/Makefile 2008-01-28 14:40:13.000000000 +0100 -@@ -140,14 +140,14 @@ - cp -fp *.8 $(INSTALLROOT)$(MANROOT)/man8/ - - install-cfg: -- cd etcfiles; ../../build/merge-lines hobbitserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitserver.cfg LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD -- cd etcfiles; ../../build/merge-lines hobbitcgi.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitcgi.cfg -- cd etcfiles; ../../build/merge-sects hobbitlaunch.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitlaunch.cfg larrdstatus=rrdstatus larrddata=rrddata -- cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg -- cd etcfiles; ../../build/merge-sects hobbitgraph.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitgraph.cfg -- cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv -- cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ -- cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-apache.conf -+ cd etcfiles; ../../build/merge-lines hobbitserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitserver.cfg-dist LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD -+ cd etcfiles; ../../build/merge-lines hobbitcgi.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitcgi.cfg-dist -+ cd etcfiles; ../../build/merge-sects hobbitlaunch.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitlaunch.cfg-dist larrdstatus=rrdstatus larrddata=rrddata -+ cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg-dist -+ cd etcfiles; ../../build/merge-sects hobbitgraph.cfg $(INSTALLROOT)$(INSTALLETCDIR)/hobbitgraph.cfg-dist -+ cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv-dist -+# cd etcfiles; (echo "bb-hosts"; echo "hobbit-alerts.cfg"; echo "hobbit-clients.cfg"; echo "bbcombotest.cfg"; echo "client-local.cfg") | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ -+ cd etcfiles; cp -fp hobbit-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/hobbit-apache.conf-dist - cd $(INSTALLROOT)$(BBHOME); rm -f hobbit.sh; ln -sf bin/hobbit.sh . - cd wwwfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat - cd webfiles; find . | grep -v RCS | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat diff --git a/net-mgmt/xymon-server/files/patch-upgrade430.sh b/net-mgmt/xymon-server/files/patch-upgrade430.sh new file mode 100644 index 000000000000..4061f1ad9e17 --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-upgrade430.sh @@ -0,0 +1,51 @@ +--- build/upgrade430.sh.orig 2010-11-17 07:35:58.000000000 +0100 ++++ build/upgrade430.sh 2011-04-02 10:17:51.000000000 +0200 +@@ -119,6 +119,8 @@ + ln -s xymonserver.cfg hobbitserver.cfg + fi + ++if test -f /nonexistent ++then + cd $BBHOME || (echo "Cannot cd to BBHOME directory"; exit 1) + if test ! -w .; then echo "Cannot write to BBHOME directory"; exit 1; fi + renameandlink hobbit.sh xymon.sh +@@ -249,6 +251,7 @@ + renameandlink hobbit-nkedit.sh criticaleditor.sh + renameandlink hobbit-ackinfo.sh ackinfo.sh + renameandlink hobbit-useradm.sh useradm.sh ++fi + + + cd $BBSERVERROOT/client/etc || (echo "Cannot cd to client/etc directory"; exit 1) +@@ -268,6 +271,8 @@ + ln -s xymonclient.cfg hobbitclient.cfg + fi + ++if test -f /nonexistent ++then + cd $BBSERVERROOT/client/bin || (echo "Cannot cd to client/bin directory"; exit 1) + if test ! -w .; then echo "Cannot write to client/bin directory"; exit 1; fi + renameandlink bb xymon +@@ -289,6 +294,7 @@ + renameandlink hobbitclient-sunos.sh xymonclient-sunos.sh + renameandlink hobbitlaunch xymonlaunch + renameandlink orcahobbit orcaxymon ++fi + + + cd $BBRRDS/$MACHINEDOTS || (echo "Cannot cd to Xymon-servers\' RRD directory"; exit 1) +@@ -313,11 +319,14 @@ + if test -d hobbitd; then mv hobbitd xymond; fi + if test -d bbproxy; then mv bbproxy xymonproxy; fi + ++if test -f /nonexistent ++then + cd $BBWWW || (echo "Cannot cd to Xymon-servers\' www directory"; exit 1) + if test ! -w .; then echo "Cannot write to Xymon-servers\' www directory"; exit 1; fi + renameandlink bb.html xymon.html + renameandlink bb2.html nongreen.html + renameandlink bbnk.html critical.html ++fi + + + echo "" diff --git a/net-mgmt/xymon-server/files/patch-xymond-Makefile b/net-mgmt/xymon-server/files/patch-xymond-Makefile new file mode 100644 index 000000000000..11ed0c631897 --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-xymond-Makefile @@ -0,0 +1,25 @@ +--- xymond/Makefile.orig 2010-11-14 18:21:19.000000000 +0100 ++++ xymond/Makefile 2011-03-31 07:23:21.000000000 +0200 +@@ -149,14 +149,14 @@ + cp -fp *.8 $(INSTALLROOT)$(MANROOT)/man8/ + + install-cfg: +- cd etcfiles; ../../build/merge-lines xymonserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonserver.cfg LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD +- cd etcfiles; ../../build/merge-lines cgioptions.cfg $(INSTALLROOT)$(INSTALLETCDIR)/cgioptions.cfg +- cd etcfiles; ../../build/merge-sects tasks.cfg $(INSTALLROOT)$(INSTALLETCDIR)/tasks.cfg larrdstatus=rrdstatus larrddata=rrddata +- cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg +- cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg +- cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv +- cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ +- cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf ++ cd etcfiles; ../../build/merge-lines xymonserver.cfg $(INSTALLROOT)$(INSTALLETCDIR)/xymonserver.cfg.DIST LARRDCOLUMN=TRENDSCOLUMN LARRDS=TEST2RRD ++ cd etcfiles; ../../build/merge-lines cgioptions.cfg $(INSTALLROOT)$(INSTALLETCDIR)/cgioptions.cfg.DIST ++ cd etcfiles; ../../build/merge-sects tasks.cfg $(INSTALLROOT)$(INSTALLETCDIR)/tasks.cfg.DIST larrdstatus=rrdstatus larrddata=rrddata ++ cd etcfiles; ../../build/merge-sects client-local.cfg $(INSTALLROOT)$(INSTALLETCDIR)/client-local.cfg.DIST ++ cd etcfiles; ../../build/merge-sects graphs.cfg $(INSTALLROOT)$(INSTALLETCDIR)/graphs.cfg.DIST ++ cd etcfiles; ../../build/merge-lines columndoc.csv $(INSTALLROOT)$(INSTALLETCDIR)/columndoc.csv.DIST ++# cd etcfiles; (echo "hosts.cfg"; echo "alerts.cfg"; echo "analysis.cfg"; echo "combo.cfg"; echo "client-local.cfg"; echo "holidays.cfg"; echo "rrddefinitions.cfg"; echo snmpmibs.cfg; echo xymonmenu.cfg) | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLETCDIR)/ ++ cd etcfiles; cp -fp xymon-apache.conf $(INSTALLROOT)$(INSTALLETCDIR)/xymon-apache.conf.DIST + cd $(INSTALLROOT)$(XYMONHOME); rm -f xymon.sh; ln -sf bin/xymon.sh . + cd wwwfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWWWDIR)/ ../../build/md5.dat + cd webfiles; find . | grep -v RCS | grep -v ".svn" | grep -v DIST | ../../build/setup-newfiles $(INSTALLROOT)$(INSTALLWEBDIR)/ ../../build/md5.dat diff --git a/net-mgmt/xymon-server/files/patch-xymonnet-Makefile b/net-mgmt/xymon-server/files/patch-xymonnet-Makefile new file mode 100644 index 000000000000..027b491b770e --- /dev/null +++ b/net-mgmt/xymon-server/files/patch-xymonnet-Makefile @@ -0,0 +1,13 @@ +--- xymonnet/Makefile.orig 2010-11-14 18:21:19.000000000 +0100 ++++ xymonnet/Makefile 2011-03-31 07:14:12.000000000 +0200 +@@ -100,8 +100,8 @@ + cp -fp $(EXTENSIONS) $(INSTALLROOT)$(INSTALLEXTDIR)/ + + install-config: +- ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg +- ../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg ++ ../build/convert-bbservices $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST ++ ../build/merge-sects protocols.cfg $(INSTALLROOT)$(INSTALLETCDIR)/protocols.cfg.DIST + + install-man: + mkdir -p $(INSTALLROOT)$(MANROOT)/man1 $(INSTALLROOT)$(MANROOT)/man5 diff --git a/net-mgmt/xymon-server/files/xymon-server.sh.in b/net-mgmt/xymon-server/files/xymon-server.sh.in new file mode 100644 index 000000000000..2c7318412262 --- /dev/null +++ b/net-mgmt/xymon-server/files/xymon-server.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: xymon_server +# REQUIRE: DAEMON + +. /etc/rc.subr + +name="xymon_server" +rcvar=`set_rcvar` + +load_rc_config "$name" +: ${xymon_server_enable:="NO"} + +command="su -m %%XYMONUSER%% -c '%%PREFIX%%/www/xymon/server/xymon.sh'" +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" + +run_rc_command "$1" +# eof diff --git a/net-mgmt/xymon-server/pkg-descr b/net-mgmt/xymon-server/pkg-descr index bb414618ebea..7a63bcb8cc9d 100644 --- a/net-mgmt/xymon-server/pkg-descr +++ b/net-mgmt/xymon-server/pkg-descr @@ -1,17 +1,17 @@ -Hobbit is a system for monitoring servers and networks. It has a great deal +Xymon is a system for monitoring servers and networks. It has a great deal of inspiration from the Big Brother monitor, but unlike Big Brother it is designed to work well whether you need to monitor small network with just a handful of hosts, or large networks with thousands of hosts. -Hobbit is the successor to the bbgen toolkit, which has been available as +Xymon is the successor to the bbgen toolkit, which has been available as an add-on to Big Brother since late 2002. The name change was decided upon -when Hobbit acquired enough functionality to be a stand-alone product. -The tools that formed the bbgen toolkit are still present in Hobbit +when Xymon acquired enough functionality to be a stand-alone product. +The tools that formed the bbgen toolkit are still present in Xymon and are quite important for it, so if you have used bbgen before, -Hobbit will seem quite familiar. +Xymon will seem quite familiar. This is the server. LICENSE: GPL2 or later -WWW: http://hobbitmon.sourceforge.net/ +WWW: http://xymon.sourceforge.net/ diff --git a/net-mgmt/xymon-server/pkg-plist b/net-mgmt/xymon-server/pkg-plist index 9cd5162da9ea..e3e44468d31e 100644 --- a/net-mgmt/xymon-server/pkg-plist +++ b/net-mgmt/xymon-server/pkg-plist @@ -1,150 +1,169 @@ -@exec if ! pw groupshow %%BBUSER%% 2>/dev/null; then pw groupadd %%BBUSER%% -g 280; fi -@exec if ! pw usershow %%BBUSER%% 2>/dev/null; then pw useradd %%BBUSER%% -g %%BBUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Hobbit Monitor"; fi -@unexec if pw usershow %%BBUSER%%; then pw userdel %%BBUSER%%; fi -%%WWWDIR%%/cgi-bin/bb-csvinfo.sh -%%WWWDIR%%/cgi-bin/bb-datepage.sh -%%WWWDIR%%/cgi-bin/bb-eventlog.sh -%%WWWDIR%%/cgi-bin/bb-findhost.sh -%%WWWDIR%%/cgi-bin/bb-hist.sh -%%WWWDIR%%/cgi-bin/bb-histlog.sh -%%WWWDIR%%/cgi-bin/bb-hostsvc.sh -%%WWWDIR%%/cgi-bin/bb-rep.sh -%%WWWDIR%%/cgi-bin/bb-replog.sh -%%WWWDIR%%/cgi-bin/bb-snapshot.sh -%%WWWDIR%%/cgi-bin/hobbit-certreport.sh -%%WWWDIR%%/cgi-bin/hobbit-confreport.sh -%%WWWDIR%%/cgi-bin/hobbit-confreport-critical.sh -%%WWWDIR%%/cgi-bin/hobbit-ghosts.sh -%%WWWDIR%%/cgi-bin/hobbit-hostgraphs.sh -%%WWWDIR%%/cgi-bin/hobbit-hostlist.sh -%%WWWDIR%%/cgi-bin/hobbit-nkview.sh -%%WWWDIR%%/cgi-bin/hobbit-nongreen.sh -%%WWWDIR%%/cgi-bin/hobbitcolumn.sh -%%WWWDIR%%/cgi-bin/hobbitgraph.sh -%%WWWDIR%%/cgi-bin/hobbit-notifylog.sh -%%WWWDIR%%/cgi-secure/bb-ack.sh -%%WWWDIR%%/cgi-secure/hobbit-ackinfo.sh -%%WWWDIR%%/cgi-secure/hobbit-enadis.sh -%%WWWDIR%%/cgi-secure/hobbit-nkedit.sh +@exec if ! pw groupshow %%XYMONUSER%% 2>/dev/null; then pw groupadd %%XYMONUSER%% -g 280; fi +@exec if ! pw usershow %%XYMONUSER%% 2>/dev/null; then pw useradd %%XYMONUSER%% -g %%XYMONUSER%% -u 280 -h - -d %%WWWDIR%% -s /usr/sbin/nologin -c "Xymon Monitor"; fi +@unexec if pw usershow %%XYMONUSER%%; then pw userdel %%XYMONUSER%%; fi +%%WWWDIR%%/cgi-bin/certreport.sh +%%WWWDIR%%/cgi-bin/columndoc.sh +%%WWWDIR%%/cgi-bin/confreport-critical.sh +%%WWWDIR%%/cgi-bin/confreport.sh +%%WWWDIR%%/cgi-bin/criticalview.sh +%%WWWDIR%%/cgi-bin/csvinfo.sh +%%WWWDIR%%/cgi-bin/datepage.sh +%%WWWDIR%%/cgi-bin/eventlog.sh +%%WWWDIR%%/cgi-bin/findhost.sh +%%WWWDIR%%/cgi-bin/ghostlist.sh +%%WWWDIR%%/cgi-bin/history.sh +%%WWWDIR%%/cgi-bin/historylog.sh +%%WWWDIR%%/cgi-bin/hostgraphs.sh +%%WWWDIR%%/cgi-bin/hostlist.sh +%%WWWDIR%%/cgi-bin/nongreen.sh +%%WWWDIR%%/cgi-bin/notifications.sh +%%WWWDIR%%/cgi-bin/perfdata.sh +%%WWWDIR%%/cgi-bin/report.sh +%%WWWDIR%%/cgi-bin/reportlog.sh +%%WWWDIR%%/cgi-bin/showgraph.sh +%%WWWDIR%%/cgi-bin/snapshot.sh +%%WWWDIR%%/cgi-bin/svcstatus.sh +%%WWWDIR%%/cgi-bin/topchanges.sh +%%WWWDIR%%/cgi-secure/ackinfo.sh +%%WWWDIR%%/cgi-secure/acknowledge.sh +%%WWWDIR%%/cgi-secure/criticaleditor.sh +%%WWWDIR%%/cgi-secure/enadis.sh +%%WWWDIR%%/cgi-secure/useradm.sh +%%WWWDIR%%/server/bin/ackinfo.cgi +%%WWWDIR%%/server/bin/acknowledge.cgi %%WWWDIR%%/server/bin/bb -%%WWWDIR%%/server/bin/bb-ack.cgi -%%WWWDIR%%/server/bin/bb-csvinfo.cgi -%%WWWDIR%%/server/bin/bb-datepage.cgi -%%WWWDIR%%/server/bin/bb-eventlog.cgi -%%WWWDIR%%/server/bin/bb-findhost.cgi -%%WWWDIR%%/server/bin/bb-hist.cgi -%%WWWDIR%%/server/bin/bb-rep.cgi -%%WWWDIR%%/server/bin/bb-replog.cgi -%%WWWDIR%%/server/bin/bb-snapshot.cgi -%%WWWDIR%%/server/bin/bb-webpage %%WWWDIR%%/server/bin/bbcmd -%%WWWDIR%%/server/bin/bbcombotest %%WWWDIR%%/server/bin/bbdigest -%%WWWDIR%%/server/bin/bbgen %%WWWDIR%%/server/bin/bbhostgrep %%WWWDIR%%/server/bin/bbhostshow -%%WWWDIR%%/server/bin/bbmessage.cgi -%%WWWDIR%%/server/bin/bbproxy -%%WWWDIR%%/server/bin/bbtest-net %%WWWDIR%%/server/bin/beastat %%WWWDIR%%/server/bin/boilerplate.cgi +%%WWWDIR%%/server/bin/combostatus +%%WWWDIR%%/server/bin/confreport.cgi %%WWWDIR%%/server/bin/convertnk -%%WWWDIR%%/server/bin/hobbit-ackinfo.cgi -%%WWWDIR%%/server/bin/hobbit-confreport.cgi -%%WWWDIR%%/server/bin/hobbit-enadis.cgi -%%WWWDIR%%/server/bin/hobbit-ghosts.cgi -%%WWWDIR%%/server/bin/hobbit-hostgraphs.cgi -%%WWWDIR%%/server/bin/hobbit-hostlist.cgi -%%WWWDIR%%/server/bin/hobbit-mailack -%%WWWDIR%%/server/bin/hobbit-nkedit.cgi -%%WWWDIR%%/server/bin/hobbit-nkview.cgi -%%WWWDIR%%/server/bin/hobbit-notifylog.cgi -%%WWWDIR%%/server/bin/hobbit-statusreport.cgi -%%WWWDIR%%/server/bin/hobbit.sh -%%WWWDIR%%/server/bin/hobbitd -%%WWWDIR%%/server/bin/hobbitd_alert -%%WWWDIR%%/server/bin/hobbitd_capture -%%WWWDIR%%/server/bin/hobbitd_channel -%%WWWDIR%%/server/bin/hobbitd_client -%%WWWDIR%%/server/bin/hobbitd_filestore -%%WWWDIR%%/server/bin/hobbitd_history -%%WWWDIR%%/server/bin/hobbitd_hostdata -%%WWWDIR%%/server/bin/hobbitd_larrd -%%WWWDIR%%/server/bin/hobbitd_rrd -%%WWWDIR%%/server/bin/hobbitd_sample -%%WWWDIR%%/server/bin/hobbitfetch -%%WWWDIR%%/server/bin/hobbitgraph.cgi -%%WWWDIR%%/server/bin/hobbitlaunch -%%WWWDIR%%/server/bin/hobbitping -%%WWWDIR%%/server/bin/hobbitreports.sh -%%WWWDIR%%/server/bin/hobbitsvc.cgi +%%WWWDIR%%/server/bin/criticaleditor.cgi +%%WWWDIR%%/server/bin/criticalview.cgi +%%WWWDIR%%/server/bin/csvinfo.cgi +%%WWWDIR%%/server/bin/datepage.cgi +%%WWWDIR%%/server/bin/enadis.cgi +%%WWWDIR%%/server/bin/eventlog.cgi +%%WWWDIR%%/server/bin/findhost.cgi +%%WWWDIR%%/server/bin/ghostlist.cgi +%%WWWDIR%%/server/bin/history.cgi +%%WWWDIR%%/server/bin/hostgraphs.cgi +%%WWWDIR%%/server/bin/hostlist.cgi %%WWWDIR%%/server/bin/moverrd.sh +%%WWWDIR%%/server/bin/notifications.cgi +%%WWWDIR%%/server/bin/perfdata.cgi +%%WWWDIR%%/server/bin/renamevars +%%WWWDIR%%/server/bin/report.cgi +%%WWWDIR%%/server/bin/reportlog.cgi +%%WWWDIR%%/server/bin/rrdcachectl +%%WWWDIR%%/server/bin/showgraph.cgi +%%WWWDIR%%/server/bin/snapshot.cgi +%%WWWDIR%%/server/bin/statusreport.cgi +%%WWWDIR%%/server/bin/svcstatus.cgi %%WWWDIR%%/server/bin/trimhistory -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bb-hosts %D/%%WWWDIR%%/server/etc/bb-hosts-dist; then rm -f %D/%%WWWDIR%%/server/etc/bb-hosts; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bb-services %D/%%WWWDIR%%/server/etc/bb-services-dist; then rm -f %D/%%WWWDIR%%/server/etc/bb-services; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/bbcombotest.cfg %D/%%WWWDIR%%/server/etc/bbcombotest.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/bbcombotest.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/client-local.cfg %D/%%WWWDIR%%/server/etc/client-local.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/client-local.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/columndoc.csv %D/%%WWWDIR%%/server/etc/columndoc.csv-dist; then rm -f %D/%%WWWDIR%%/server/etc/columndoc.csv; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-alerts.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-apache.conf %D/%%WWWDIR%%/server/etc/hobbit-apache.conf-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-apache.conf; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-clients.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitcgi.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitgraph.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitlaunch.cfg; fi -@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hobbitserver.cfg %D/%%WWWDIR%%/server/etc/hobbitserver.cfg-dist; then rm -f %D/%%WWWDIR%%/server/etc/hobbitserver.cfg; fi -%%WWWDIR%%/server/etc/bb-hosts-dist -@exec [ ! -f %B/bb-hosts ] && cp %B/%f %B/bb-hosts -%%WWWDIR%%/server/etc/bb-services-dist -@exec [ ! -f %B/bb-services ] && cp %B/%f %B/bb-services -%%WWWDIR%%/server/etc/bbcombotest.cfg-dist -@exec [ ! -f %B/bbcombotest.cfg ] && cp %B/%f %B/bbcombotest.cfg -%%WWWDIR%%/server/etc/client-local.cfg-dist +%%WWWDIR%%/server/bin/useradm.cgi +%%WWWDIR%%/server/bin/upgrade430.sh +%%WWWDIR%%/server/bin/xymon +%%WWWDIR%%/server/bin/xymon-mailack +%%WWWDIR%%/server/bin/xymon.sh +%%WWWDIR%%/server/bin/xymoncfg +%%WWWDIR%%/server/bin/xymoncgimsg.cgi +%%WWWDIR%%/server/bin/xymoncmd +%%WWWDIR%%/server/bin/xymond +%%WWWDIR%%/server/bin/xymond_alert +%%WWWDIR%%/server/bin/xymond_capture +%%WWWDIR%%/server/bin/xymond_channel +%%WWWDIR%%/server/bin/xymond_client +%%WWWDIR%%/server/bin/xymond_filestore +%%WWWDIR%%/server/bin/xymond_history +%%WWWDIR%%/server/bin/xymond_hostdata +%%WWWDIR%%/server/bin/xymond_locator +%%WWWDIR%%/server/bin/xymond_rrd +%%WWWDIR%%/server/bin/xymond_sample +%%WWWDIR%%/server/bin/xymondigest +%%WWWDIR%%/server/bin/xymonfetch +%%WWWDIR%%/server/bin/xymongen +%%WWWDIR%%/server/bin/xymongrep +%%WWWDIR%%/server/bin/xymonlaunch +%%WWWDIR%%/server/bin/xymonnet +%%WWWDIR%%/server/bin/xymonpage +%%WWWDIR%%/server/bin/xymonping +%%WWWDIR%%/server/bin/xymonproxy +%%WWWDIR%%/server/bin/xymonreports.sh +%%WWWDIR%%/server/etc/xymon-apache-open.DIST +%%WWWDIR%%/server/etc/xymon-apache-secure.DIST +%%WWWDIR%%/server/etc/xymon-apache.conf.DIST +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/alerts.cfg %D/%%WWWDIR%%/server/etc/alerts.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/alerts.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/analysis.cfg %D/%%WWWDIR%%/server/etc/analysis.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/analysis.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/cgioptions.cfg %D/%%WWWDIR%%/server/etc/cgioptions.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/cgioptions.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/client-local.cfg %D/%%WWWDIR%%/server/etc/client-local.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/client-local.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/columndoc.csv %D/%%WWWDIR%%/server/etc/columndoc.csv.DIST; then rm -f %D/%%WWWDIR%%/server/etc/columndoc.csv; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/combo.cfg %D/%%WWWDIR%%/server/etc/combo.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/combo.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/graphs.cfg %D/%%WWWDIR%%/server/etc/graphs.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/graphs.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/holidays.cfg %D/%%WWWDIR%%/server/etc/holidays.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/holidays.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/hosts.cfg %D/%%WWWDIR%%/server/etc/hosts.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/hosts.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/protocols.cfg %D/%%WWWDIR%%/server/etc/protocols.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/protocols.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/rrddefinitions.cfg %D/%%WWWDIR%%/server/etc/rrddefinitions.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/rrddefinitions.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/snmpmibs.cfg %D/%%WWWDIR%%/server/etc/snmpmibs.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/snmpmibs.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/tasks.cfg %D/%%WWWDIR%%/server/etc/tasks.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/tasks.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/xymonmenu.cfg %D/%%WWWDIR%%/server/etc/xymonmenu.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/xymonmenu.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/xymonserver-migration.cfg %D/%%WWWDIR%%/server/etc/xymonserver-migration.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/xymonserver-migration.cfg; fi +@unexec if cmp -s %D/%%WWWDIR%%/server/etc/xymonserver.cfg %D/%%WWWDIR%%/server/etc/xymonserver.cfg.DIST; then rm -f %D/%%WWWDIR%%/server/etc/xymonserver.cfg; fi +@unexec if test ! -s %D/%%WWWDIR%%/server/etc/critical.cfg; then rm -f %D/%%WWWDIR%%/server/etc/critical.cfg; fi +@unexec if test ! -s %D/%%WWWDIR%%/server/etc/critical.cfg.bak; then rm -f %D/%%WWWDIR%%/server/etc/critical.cfg.bak; fi +%%WWWDIR%%/server/etc/alerts.cfg.DIST +@exec [ ! -f %B/alerts.cfg ] && cp %B/%f %B/alerts.cfg +%%WWWDIR%%/server/etc/analysis.cfg.DIST +@exec [ ! -f %B/analysis.cfg ] && cp %B/%f %B/analysis.cfg +%%WWWDIR%%/server/etc/cgioptions.cfg.DIST +@exec [ ! -f %B/cgioptions.cfg ] && cp %B/%f %B/cgioptions.cfg +%%WWWDIR%%/server/etc/client-local.cfg.DIST @exec [ ! -f %B/client-local.cfg ] && cp %B/%f %B/client-local.cfg -%%WWWDIR%%/server/etc/columndoc.csv-dist -@exec [ ! -f %B/columndoc.cfg ] && cp %B/%f %B/columndoc.cfg -%%WWWDIR%%/server/etc/hobbit-alerts.cfg-dist -@exec [ ! -f %B/hobbit-alerts.cfg ] && cp %B/%f %B/hobbit-alerts.cfg -%%WWWDIR%%/server/etc/hobbit-apache.conf-dist -@exec [ ! -f %B/hobbit-apache.cfg ] && cp %B/%f %B/hobbit-apache.cfg -%%WWWDIR%%/server/etc/hobbit-clients.cfg-dist -@exec [ ! -f %B/hobbit-clients.cfg ] && cp %B/%f %B/hobbit-clients.cfg -@unexec if test ! -s %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg; fi -@unexec if test ! -s %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak; then rm -f %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak; fi -@exec touch %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg %D/%%WWWDIR%%/server/etc/hobbit-nkview.cfg.bak -%%WWWDIR%%/server/etc/hobbitcgi.cfg-dist -@exec [ ! -f %B/hobbitcgi.cfg ] && cp %B/%f %B/hobbitcgi.cfg -%%WWWDIR%%/server/etc/hobbitgraph.cfg-dist -@exec [ ! -f %B/hobbitgraph.cfg ] && cp %B/%f %B/hobbitgraph.cfg -%%WWWDIR%%/server/etc/hobbitlaunch.cfg-dist -@exec [ ! -f %B/hobbitlaunch.cfg ] && cp %B/%f %B/hobbitlaunch.cfg -%%WWWDIR%%/server/etc/hobbitserver.cfg-dist -@exec [ ! -f %B/hobbitserver.cfg ] && cp %B/%f %B/hobbitserver.cfg -%%WWWDIR%%/server/ext/bbretest-net.sh -%%WWWDIR%%/server/hobbit.sh +%%WWWDIR%%/server/etc/columndoc.csv.DIST +@exec [ ! -f %B/columndoc.csv ] && cp %B/%f %B/columndoc.csv +%%WWWDIR%%/server/etc/combo.cfg.DIST +@exec [ ! -f %B/combo.cfg ] && cp %B/%f %B/combo.cfg +%%WWWDIR%%/server/etc/graphs.cfg.DIST +@exec [ ! -f %B/graphs.cfg ] && cp %B/%f %B/graphs.cfg +%%WWWDIR%%/server/etc/holidays.cfg.DIST +@exec [ ! -f %B/holidays.cfg ] && cp %B/%f %B/holidays.cfg +%%WWWDIR%%/server/etc/hosts.cfg.DIST +@exec [ ! -f %B/hosts.cfg ] && cp %B/%f %B/hosts.cfg +%%WWWDIR%%/server/etc/protocols.cfg.DIST +@exec [ ! -f %B/protocols.cfg ] && cp %B/%f %B/protocols.cfg +%%WWWDIR%%/server/etc/rrddefinitions.cfg.DIST +@exec [ ! -f %B/rrddefinitions.cfg ] && cp %B/%f %B/rrddefinitions.cfg +%%WWWDIR%%/server/etc/snmpmibs.cfg.DIST +@exec [ ! -f %B/snmpmibs.cfg ] && cp %B/%f %B/snmpmibs.cfg +%%WWWDIR%%/server/etc/tasks.cfg.DIST +@exec [ ! -f %B/tasks.cfg ] && cp %B/%f %B/tasks.cfg +%%WWWDIR%%/server/etc/xymonmenu.cfg.DIST +@exec [ ! -f %B/xymonmenu.cfg ] && cp %B/%f %B/xymonmenu.cfg +%%WWWDIR%%/server/etc/xymonserver-migration.cfg.DIST +@exec [ ! -f %B/xymonserver-migration.cfg ] && cp %B/%f %B/xymonserver-migration.cfg +%%WWWDIR%%/server/etc/xymonserver.cfg.DIST +@exec [ ! -f %B/xymonserver.cfg ] && cp %B/%f %B/xymonserver.cfg +@exec touch %D/%%WWWDIR%%/server/etc/critical.cfg %D/%%WWWDIR%%/server/etc/critical.cfg.bak +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/etc/critical.cfg.bak %D/%%WWWDIR%%/server/etc/critical.cfg +%%WWWDIR%%/server/ext/xymonnet-again.sh %%WWWDIR%%/server/web/acknowledge_footer %%WWWDIR%%/server/web/acknowledge_form %%WWWDIR%%/server/web/acknowledge_header -%%WWWDIR%%/server/web/bb2_footer -%%WWWDIR%%/server/web/bb2_header -%%WWWDIR%%/server/web/bb_footer -%%WWWDIR%%/server/web/bb_header -%%WWWDIR%%/server/web/bbnk_footer -%%WWWDIR%%/server/web/bbnk_header -%%WWWDIR%%/server/web/bbrep_footer -%%WWWDIR%%/server/web/bbrep_header -%%WWWDIR%%/server/web/bbsnap2_footer -%%WWWDIR%%/server/web/bbsnap2_header -%%WWWDIR%%/server/web/bbsnap_footer -%%WWWDIR%%/server/web/bbsnap_header -%%WWWDIR%%/server/web/bbsnapnk_footer -%%WWWDIR%%/server/web/bbsnapnk_header %%WWWDIR%%/server/web/columndoc_footer %%WWWDIR%%/server/web/columndoc_header %%WWWDIR%%/server/web/confreport_back %%WWWDIR%%/server/web/confreport_footer %%WWWDIR%%/server/web/confreport_front %%WWWDIR%%/server/web/confreport_header +%%WWWDIR%%/server/web/critack_form +%%WWWDIR%%/server/web/critedit_footer +%%WWWDIR%%/server/web/critedit_form +%%WWWDIR%%/server/web/critedit_header +%%WWWDIR%%/server/web/critical_footer +%%WWWDIR%%/server/web/critical_header %%WWWDIR%%/server/web/event_footer %%WWWDIR%%/server/web/event_form %%WWWDIR%%/server/web/event_header @@ -159,8 +178,6 @@ %%WWWDIR%%/server/web/hist_header %%WWWDIR%%/server/web/histlog_footer %%WWWDIR%%/server/web/histlog_header -%%WWWDIR%%/server/web/hobbitnk_footer -%%WWWDIR%%/server/web/hobbitnk_header %%WWWDIR%%/server/web/hostlist_form %%WWWDIR%%/server/web/hostlist_footer %%WWWDIR%%/server/web/hostlist_header @@ -176,24 +193,44 @@ %%WWWDIR%%/server/web/maint_header %%WWWDIR%%/server/web/maintact_footer %%WWWDIR%%/server/web/maintact_header -%%WWWDIR%%/server/web/nkack_form -%%WWWDIR%%/server/web/nkedit_footer -%%WWWDIR%%/server/web/nkedit_form -%%WWWDIR%%/server/web/nkedit_header %%WWWDIR%%/server/web/notify_footer %%WWWDIR%%/server/web/notify_form %%WWWDIR%%/server/web/notify_header +%%WWWDIR%%/server/web/perfdata_footer +%%WWWDIR%%/server/web/perfdata_form +%%WWWDIR%%/server/web/perfdata_header %%WWWDIR%%/server/web/replog_footer %%WWWDIR%%/server/web/replog_header +%%WWWDIR%%/server/web/repnormal_footer +%%WWWDIR%%/server/web/repnormal_header %%WWWDIR%%/server/web/report_footer %%WWWDIR%%/server/web/report_form %%WWWDIR%%/server/web/report_form_daily %%WWWDIR%%/server/web/report_form_monthly %%WWWDIR%%/server/web/report_form_weekly %%WWWDIR%%/server/web/report_header +%%WWWDIR%%/server/web/snapcritical_footer +%%WWWDIR%%/server/web/snapcritical_header +%%WWWDIR%%/server/web/snapnongreen_footer +%%WWWDIR%%/server/web/snapnongreen_header +%%WWWDIR%%/server/web/snapnormal_footer +%%WWWDIR%%/server/web/snapnormal_header %%WWWDIR%%/server/web/snapshot_footer %%WWWDIR%%/server/web/snapshot_form %%WWWDIR%%/server/web/snapshot_header +%%WWWDIR%%/server/web/stdcritical_footer +%%WWWDIR%%/server/web/stdcritical_header +%%WWWDIR%%/server/web/stdnongreen_footer +%%WWWDIR%%/server/web/stdnongreen_header +%%WWWDIR%%/server/web/stdnormal_footer +%%WWWDIR%%/server/web/stdnormal_header +%%WWWDIR%%/server/web/topchanges_footer +%%WWWDIR%%/server/web/topchanges_form +%%WWWDIR%%/server/web/topchanges_header +%%WWWDIR%%/server/web/trends_form +%%WWWDIR%%/server/web/useradm_footer +%%WWWDIR%%/server/web/useradm_form +%%WWWDIR%%/server/web/useradm_header %%WWWDIR%%/server/web/zoom.js %%WWWDIR%%/server/www/gifs/README %%WWWDIR%%/server/www/gifs/arrow.gif @@ -225,12 +262,14 @@ %%WWWDIR%%/server/www/gifs/red.gif %%WWWDIR%%/server/www/gifs/unknown-recent.gif %%WWWDIR%%/server/www/gifs/unknown.gif +%%WWWDIR%%/server/www/gifs/xymonbody.css %%WWWDIR%%/server/www/gifs/yellow-ack.gif %%WWWDIR%%/server/www/gifs/yellow-recent.gif %%WWWDIR%%/server/www/gifs/yellow.gif %%WWWDIR%%/server/www/gifs/zoom.gif +%%WWWDIR%%/server/www/help/Renaming-430.txt %%WWWDIR%%/server/www/help/about.html -%%WWWDIR%%/server/www/help/bb-to-hobbit.html +%%WWWDIR%%/server/www/help/bb-to-xymon.html %%WWWDIR%%/server/www/help/clonewarn.jpg %%WWWDIR%%/server/www/help/configure.txt %%WWWDIR%%/server/www/help/criticalsystems.html @@ -246,91 +285,96 @@ %%WWWDIR%%/server/www/help/editor-makeclone.jpg %%WWWDIR%%/server/www/help/editor-nohost.jpg %%WWWDIR%%/server/www/help/editor-showclone.jpg -%%WWWDIR%%/server/www/help/hobbit-alerts.html -%%WWWDIR%%/server/www/help/hobbit-apacheconf.txt -%%WWWDIR%%/server/www/help/hobbit-bbhosts.png -%%WWWDIR%%/server/www/help/hobbit-clients.png -%%WWWDIR%%/server/www/help/hobbit-config.html -%%WWWDIR%%/server/www/help/hobbit-mrtg.html -%%WWWDIR%%/server/www/help/hobbit-tips.html -%%WWWDIR%%/server/www/help/hobbitmain.png -%%WWWDIR%%/server/www/help/hobbitprocs.png %%WWWDIR%%/server/www/help/howtograph.html %%WWWDIR%%/server/www/help/install.html %%WWWDIR%%/server/www/help/known-issues.html %%WWWDIR%%/server/www/help/mainview-acked.jpg %%WWWDIR%%/server/www/help/mainview.jpg %%WWWDIR%%/server/www/help/manpages/index.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-ack.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-csvinfo.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-datepage.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-eventlog.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-findhost.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-hist.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-rep.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-replog.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-snapshot.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb-webpage.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bb.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbcmd.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbcombotest.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbdigest.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbgen.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbhostgrep.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbhostshow.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbretest-net.sh.1.html -%%WWWDIR%%/server/www/help/manpages/man1/bbtest-net.1.html +%%WWWDIR%%/server/www/help/manpages/man1/ackinfo.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/acknowledge.cgi.1.html %%WWWDIR%%/server/www/help/manpages/man1/clientupdate.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-ackinfo.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-confreport.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-ghosts.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-hostgraphs.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-nkedit.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-nkview.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbit-statusreport.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitgraph.cgi.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitping.1.html -%%WWWDIR%%/server/www/help/manpages/man1/hobbitsvc.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/combostatus.1.html +%%WWWDIR%%/server/www/help/manpages/man1/confreport.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/criticaleditor.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/criticalview.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/csvinfo.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/datepage.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/eventlog.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/findhost.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/ghostlist.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/history.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/hostgraphs.cgi.1.html %%WWWDIR%%/server/www/help/manpages/man1/logfetch.1.html -%%WWWDIR%%/server/www/help/manpages/man1/orcahobbit.1.html -%%WWWDIR%%/server/www/help/manpages/man5/bb-hosts.5.html -%%WWWDIR%%/server/www/help/manpages/man5/bb-services.5.html -%%WWWDIR%%/server/www/help/manpages/man5/bbcombotest.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man1/orcaxymon.1.html +%%WWWDIR%%/server/www/help/manpages/man1/report.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/reportlog.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/showgraph.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/snapshot.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/statusreport.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/svcstatus.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymon.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymoncfg.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymoncmd.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymondigest.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymongen.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymongrep.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymonnet-again.sh.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymonnet.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymonpage.cgi.1.html +%%WWWDIR%%/server/www/help/manpages/man1/xymonping.1.html +%%WWWDIR%%/server/www/help/manpages/man5/alerts.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/analysis.cfg.5.html %%WWWDIR%%/server/www/help/manpages/man5/client-local.cfg.5.html %%WWWDIR%%/server/www/help/manpages/man5/clientlaunch.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-alerts.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-clients.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbit-nkview.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitcgi.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitclient.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitgraph.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitlaunch.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitserver.cfg.5.html -%%WWWDIR%%/server/www/help/manpages/man5/hobbitweb.5.html +%%WWWDIR%%/server/www/help/manpages/man5/cgioptions.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/combo.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/critical.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/graphs.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/hosts.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/protocols.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/tasks.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/xymon-xmh.5.html +%%WWWDIR%%/server/www/help/manpages/man5/xymonclient.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/xymonserver.cfg.5.html +%%WWWDIR%%/server/www/help/manpages/man5/xymonweb.5.html %%WWWDIR%%/server/www/help/manpages/man7/xymon.7.html -%%WWWDIR%%/server/www/help/manpages/man8/bbmessage.cgi.8.html -%%WWWDIR%%/server/www/help/manpages/man8/bbproxy.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbit-enadis.cgi.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbit-mailack.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_alert.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_channel.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_client.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_filestore.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_history.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_hostdata.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_rrd.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitd_sample.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitfetch.8.html -%%WWWDIR%%/server/www/help/manpages/man8/hobbitlaunch.8.html +%%WWWDIR%%/server/www/help/manpages/man8/enadis.cgi.8.html %%WWWDIR%%/server/www/help/manpages/man8/msgcache.8.html %%WWWDIR%%/server/www/help/manpages/man8/trimhistory.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymon-mailack.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymoncgimsg.cgi.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_alert.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_capture.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_channel.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_client.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_filestore.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_history.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_hostdata.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_rrd.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymond_sample.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymonfetch.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymonlaunch.8.html +%%WWWDIR%%/server/www/help/manpages/man8/xymonproxy.8.html %%WWWDIR%%/server/www/help/stdview-detail-acked.jpg -%%WWWDIR%%/server/www/menu/README -%%WWWDIR%%/server/www/menu/menu.css -%%WWWDIR%%/server/www/menu/menu.js -%%WWWDIR%%/server/www/menu/menu_items.js -%%WWWDIR%%/server/www/menu/menu_tpl.js +%%WWWDIR%%/server/www/help/upgrade-to-430.txt +%%WWWDIR%%/server/www/help/xymon-alerts.html +%%WWWDIR%%/server/www/help/xymon-apacheconf.txt +%%WWWDIR%%/server/www/help/xymon-clients.png +%%WWWDIR%%/server/www/help/xymon-config.html +%%WWWDIR%%/server/www/help/xymon-hosts.png +%%WWWDIR%%/server/www/help/xymon-mrtg.html +%%WWWDIR%%/server/www/help/xymon-tips.html +%%WWWDIR%%/server/www/help/xymonmain.png +%%WWWDIR%%/server/www/help/xymonprocs.png +%%WWWDIR%%/server/www/menu/b2t-blue.gif +%%WWWDIR%%/server/www/menu/b2t-grey.gif +%%WWWDIR%%/server/www/menu/t2b-blue.gif +%%WWWDIR%%/server/www/menu/t2b-grey.gif +%%WWWDIR%%/server/www/menu/xymonmenu-blue.css +%%WWWDIR%%/server/www/menu/xymonmenu-grey.css +%%WWWDIR%%/server/xymon.sh @exec mkdir %D/%%WWWDIR%%/data @exec mkdir %D/%%WWWDIR%%/data/acks @exec mkdir %D/%%WWWDIR%%/data/data @@ -347,22 +391,22 @@ @exec mkdir %D/%%WWWDIR%%/server/www/rep @exec mkdir %D/%%WWWDIR%%/server/www/snap @exec mkdir %D/%%WWWDIR%%/server/www/wml -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/acks -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/data -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/disabled -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/hist -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/histlogs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/hostdata -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/logs -@exec chown %%BBUSER%% %D/%%WWWDIR%%/data/rrd -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/download -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/tmp -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/html -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/notes -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/rep -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/snap -@exec chown %%BBUSER%% %D/%%WWWDIR%%/server/www/wml +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/acks +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/data +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/disabled +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hist +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/histlogs +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/hostdata +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/logs +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/data/rrd +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/download +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/tmp +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/html +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/notes +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/rep +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/snap +@exec chown %%XYMONUSER%% %D/%%WWWDIR%%/server/www/wml @dirrm %%WWWDIR%%/server/www/wml @dirrm %%WWWDIR%%/server/www/snap @dirrm %%WWWDIR%%/server/www/rep @@ -396,8 +440,8 @@ @dirrm %%WWWDIR%%/cgi-secure @dirrm %%WWWDIR%%/cgi-bin @dirrmtry %%WWWDIR%% -@exec mkdir -p %%VARBASE%%/log/hobbit -@exec chown %%BBUSER%% %%VARBASE%%/log/hobbit +@exec mkdir -p %%VARBASE%%/log/xymon +@exec chown %%XYMONUSER%% %%VARBASE%%/log/xymon @cwd %%VARBASE%% -@dirrmtry log/hobbit +@dirrmtry log/xymon @cwd |