summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-08-21 13:49:09 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-08-21 13:49:09 +0000
commitb346baff91837eae87aa5829e7c5d7787ed4d4d4 (patch)
treeddb798182cdc71a0926bb9c67fdfd0656bd74bfd
parent- Upgrade to 0.14. (diff)
Update to 4.1.1.
Use the new options targets, and replace most of the patches with sed. Sponsored by: Absolight
-rw-r--r--net-mgmt/nagios4/Makefile27
-rw-r--r--net-mgmt/nagios4/distinfo4
-rw-r--r--net-mgmt/nagios4/files/extra-patch-html__side.php13
-rw-r--r--net-mgmt/nagios4/files/patch-Makefile.in55
-rw-r--r--net-mgmt/nagios4/files/patch-base__Makefile.in15
-rw-r--r--net-mgmt/nagios4/files/patch-cgi__Makefile.in14
-rw-r--r--net-mgmt/nagios4/files/patch-configure8
-rw-r--r--net-mgmt/nagios4/files/patch-contrib__Makefile.in17
-rw-r--r--net-mgmt/nagios4/files/patch-html__Makefile.in96
-rw-r--r--net-mgmt/nagios4/files/patch-html__index.php2
-rw-r--r--net-mgmt/nagios4/files/patch-html__main.php12
-rw-r--r--net-mgmt/nagios4/files/pkg-message.in12
-rw-r--r--net-mgmt/nagios4/pkg-plist788
13 files changed, 458 insertions, 605 deletions
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index c547d68b20da..2749038da89c 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= nagios
-PORTVERSION= 4.0.8
-PORTREVISION= 4
+PORTVERSION= 4.1.1
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 4
@@ -30,9 +29,9 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-nagios-group=${NAGIOSGROUP} \
--with-htmurl=${NAGIOSHTMURL} \
--with-cgiurl=${NAGIOSCGIURL} \
- --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
+ --sbindir=${WWWDIR}/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
- --datadir=${PREFIX}/${NAGIOSWWWDIR} \
+ --datadir=${WWWDIR} \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${NAGIOSDIR} \
--with-httpd-conf=${PREFIX}/etc \
@@ -48,12 +47,10 @@ LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install install-commandmode install-config
PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \
- NAGIOSWWWDIR=${NAGIOSWWWDIR} \
NAGIOSUSER=${NAGIOSUSER} \
NAGIOSGROUP=${NAGIOSGROUP} \
WWWGRP=${WWWGRP}
SUB_LIST= NAGIOSDIR=${NAGIOSDIR} \
- NAGIOSWWWDIR=${PREFIX}/${NAGIOSWWWDIR} \
NAGIOSUSER=${NAGIOSUSER} \
NAGIOSGROUP=${NAGIOSGROUP} \
NAGIOSHTMURL=${NAGIOSHTMURL} \
@@ -65,7 +62,9 @@ NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
-NAGIOSWWWDIR?= www/nagios
+.if defined(NAGIOSWWWDIR)
+WWWDIR= ${PREFIX}/${NAGIOSWWWDIR}
+.endif
NAGIOSHTMURL?= /nagios
NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
@@ -86,11 +85,17 @@ OPTIONS_SUB=
NANOSLEEP_CONFIGURE_ENABLE= nanosleep
-# sed -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \
-# 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
-UNHANDLED_HACK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-html__side.php
+post-patch:
+ ${REINPLACE_CMD} -e 's/\<77\([0-7]\)\>/75\1/g; s/\<66\([0-7]\)\>/64\1/; /chmod/d; \
+ /\.cfg$$/s/$$/-sample/' \
+ ${WRKSRC}/Makefile.in ${WRKSRC}/base/Makefile.in ${WRKSRC}/cgi/Makefile.in ${WRKSRC}/contrib/Makefile.in ${WRKSRC}/html/Makefile.in
+
+post-patch-UNHANDLED_HACK-on:
+ ${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \
+ 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php ${STAGEDIR}${PREFIX}/${NAGIOSWWWDIR}/config.inc.php.sample
+ @${RMDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+ @${MV} ${STAGEDIR}${WWWDIR}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample
.include <bsd.port.mk>
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index 71d2f8ce921c..6f8e9581f61e 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.0.8.tar.gz) = 8b268d250c97851775abe162f46f64724f95f367d752ae4630280cc5d368ca4b
-SIZE (nagios-4.0.8.tar.gz) = 1805059
+SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7
+SIZE (nagios-4.1.1.tar.gz) = 11142182
diff --git a/net-mgmt/nagios4/files/extra-patch-html__side.php b/net-mgmt/nagios4/files/extra-patch-html__side.php
deleted file mode 100644
index b9d05c3f344d..000000000000
--- a/net-mgmt/nagios4/files/extra-patch-html__side.php
+++ /dev/null
@@ -1,13 +0,0 @@
---- html/side.php.orig 2014-08-12 15:00:01 UTC
-+++ html/side.php
-@@ -56,8 +56,8 @@ $link_target = 'main';
- <li>
- <a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Problems</a>
- <ul>
-- <li><a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Services</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;type=detail&amp;hoststatustypes=3&amp;serviceprops=42&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Unhandled</a>)</li>
-- <li><a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&amp;style=hostdetail&amp;hoststatustypes=12" target="<?php echo $link_target;?>">Hosts</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&amp;style=hostdetail&amp;hoststatustypes=12&amp;hostprops=42" target="<?php echo $link_target;?>">Unhandled</a>)</li>
-+ <li><a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Services</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?host=all&amp;type=detail&amp;hoststatustypes=3&amp;serviceprops=10&amp;servicestatustypes=28" target="<?php echo $link_target;?>">Unhandled</a>)</li>
-+ <li><a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&amp;style=hostdetail&amp;hoststatustypes=12" target="<?php echo $link_target;?>">Hosts</a> (<a href="<?php echo $cfg["cgi_base_url"];?>/status.cgi?hostgroup=all&amp;style=hostdetail&amp;hoststatustypes=12&amp;hostprops=10" target="<?php echo $link_target;?>">Unhandled</a>)</li>
- <li><a href="<?php echo $cfg["cgi_base_url"];?>/outages.cgi" target="<?php echo $link_target;?>">Network Outages</a></li>
- </ul>
- </li>
diff --git a/net-mgmt/nagios4/files/patch-Makefile.in b/net-mgmt/nagios4/files/patch-Makefile.in
deleted file mode 100644
index b9396fecb6f0..000000000000
--- a/net-mgmt/nagios4/files/patch-Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.in.orig 2014-08-12 15:00:01 UTC
-+++ Makefile.in
-@@ -245,11 +245,10 @@ install-unstripped:
- $(MAKE) install-basic
-
- install-basic:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
-- chmod g+s $(DESTDIR)$(CHECKRESULTDIR)
-
- @echo ""
- @echo "*** Main program, CGIs and HTML files installed ***"
-@@ -270,19 +269,18 @@ install-basic:
-
-
- install-config:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
-- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg-sample
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg-sample
-
- @echo ""
- @echo "*** Config files installed ***"
-@@ -330,7 +328,6 @@ install-daemoninit:
-
- install-commandmode:
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
-- chmod g+s $(DESTDIR)$(LOGDIR)/rw
-
- @echo ""
- @echo "*** External command directory configured ***"
diff --git a/net-mgmt/nagios4/files/patch-base__Makefile.in b/net-mgmt/nagios4/files/patch-base__Makefile.in
deleted file mode 100644
index 2db9772aa3ca..000000000000
--- a/net-mgmt/nagios4/files/patch-base__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- base/Makefile.in.orig 2014-08-12 15:00:01 UTC
-+++ base/Makefile.in
-@@ -180,9 +180,9 @@ install-unstripped:
- $(MAKE) install-basic
-
- install-basic:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-
- strip-post-install:
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff --git a/net-mgmt/nagios4/files/patch-cgi__Makefile.in b/net-mgmt/nagios4/files/patch-cgi__Makefile.in
deleted file mode 100644
index dae4c5e97b8e..000000000000
--- a/net-mgmt/nagios4/files/patch-cgi__Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- cgi/Makefile.in.orig 2014-08-12 15:00:01 UTC
-+++ cgi/Makefile.in
-@@ -201,9 +201,9 @@ install-unstripped:
- $(MAKE) install-basic
-
- install-basic:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
- for file in *.cgi; do \
-- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
- done
-
- strip-post-install:
diff --git a/net-mgmt/nagios4/files/patch-configure b/net-mgmt/nagios4/files/patch-configure
index fc2493eff76e..0c47ef81c0ff 100644
--- a/net-mgmt/nagios4/files/patch-configure
+++ b/net-mgmt/nagios4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-08-12 15:00:01 UTC
+--- configure.orig 2015-08-19 21:49:52 UTC
+++ configure
-@@ -6014,7 +6014,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
_ACEOF
@@ -8,7 +8,7 @@
-@@ -6035,7 +6034,6 @@ fi
+@@ -6037,7 +6036,6 @@ fi
@@ -16,7 +16,7 @@
MAIL_PROG=no
-@@ -7766,7 +7764,7 @@ $as_echo_n "checking for linker flags fo
+@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo
MOD_LDFLAGS="-shared"
MOD_CFLAGS="-fPIC"
;;
diff --git a/net-mgmt/nagios4/files/patch-contrib__Makefile.in b/net-mgmt/nagios4/files/patch-contrib__Makefile.in
deleted file mode 100644
index 04161a9d1e13..000000000000
--- a/net-mgmt/nagios4/files/patch-contrib__Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- contrib/Makefile.in.orig 2014-08-12 15:00:01 UTC
-+++ contrib/Makefile.in
-@@ -52,10 +52,10 @@ distclean: clean
- devclean: distclean
-
- install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
-- for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+ for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
-+ for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-
- ##############################################################################
- # rules and dependencies for actual target programs
diff --git a/net-mgmt/nagios4/files/patch-html__Makefile.in b/net-mgmt/nagios4/files/patch-html__Makefile.in
index ea99a6df842e..33f0176ed81f 100644
--- a/net-mgmt/nagios4/files/patch-html__Makefile.in
+++ b/net-mgmt/nagios4/files/patch-html__Makefile.in
@@ -1,94 +1,14 @@
---- html/Makefile.in.orig 2014-08-12 15:00:01 UTC
+--- html/Makefile.in.orig 2015-08-19 21:49:52 UTC
+++ html/Makefile.in
-@@ -35,58 +35,58 @@ distclean: clean
- devclean: distclean
+@@ -45,11 +45,8 @@ devclean: distclean
install:
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
-- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
-+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
-+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
-+# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
-+# $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
- # Remove old HTML files (PHP files are used now)
- rm -f $(DESTDIR)$(HTMLDIR)/index.html
- rm -f $(DESTDIR)$(HTMLDIR)/main.html
- rm -f $(DESTDIR)$(HTMLDIR)/side.html
-- $(INSTALL) -m 664 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR)
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR)
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR)
-+ $(INSTALL) -m 644 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR)
- for file in *.php; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
- # for file in media/*.wav; \
--# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
-+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
- for file in stylesheets/*.css; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- for file in contexthelp/*.html; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- for file in js/*.js; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
- # for file in docs/*.html; \
--# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- # for file in docs/images/*.*; \
--# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+# do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
- for file in images/*.gif; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.jpg; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.png; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/*.ico; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
- for file in images/logos/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- for file in includes/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
- for file in includes/rss/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
- for file in includes/rss/extlib/*.*; \
-- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
-+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
-
- install-unstripped:
- $(MAKE) install
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
diff --git a/net-mgmt/nagios4/files/patch-html__index.php b/net-mgmt/nagios4/files/patch-html__index.php
index 74895cc3e698..17d13bb30a26 100644
--- a/net-mgmt/nagios4/files/patch-html__index.php
+++ b/net-mgmt/nagios4/files/patch-html__index.php
@@ -1,4 +1,4 @@
---- html/index.php.orig 2014-08-12 15:00:01 UTC
+--- html/index.php.orig 2015-08-19 21:49:52 UTC
+++ html/index.php
@@ -1,6 +1,7 @@
<?php
diff --git a/net-mgmt/nagios4/files/patch-html__main.php b/net-mgmt/nagios4/files/patch-html__main.php
index 5f9475c4d339..5a538519f102 100644
--- a/net-mgmt/nagios4/files/patch-html__main.php
+++ b/net-mgmt/nagios4/files/patch-html__main.php
@@ -1,10 +1,10 @@
---- html/main.php.orig 2014-08-12 15:00:01 UTC
+--- html/main.php.orig 2015-08-19 21:49:52 UTC
+++ html/main.php
-@@ -130,31 +130,6 @@ $this_year = '2014';
+@@ -130,31 +130,6 @@ $this_year = '2015';
<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
<div class="version">Version <?php echo $this_version; ?></div>
- <div class="releasedate">August 12, 2014</div>
-- <div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
+ <div class="releasedate">August 19, 2015</div>
+- <div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
-</div>
-
-
@@ -15,7 +15,7 @@
-?>
- <div class="updatechecksdisabled">
- <div class="warningmessage">Warning: Automatic Update Checks are Disabled!</div>
-- <div class="submessage">Disabling update checks presents a possible security risk. Visit <a href="http://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
+- <div class="submessage">Disabling update checks presents a possible security risk. Visit <a href="https://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
- </div>
-<?php
- } else if (
@@ -24,7 +24,7 @@
-?>
- <div class="updateavailable">
- <div class="updatemessage">A new version of Nagios Core is available!</div>
-- <div class="submessage">Visit <a href="http://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
+- <div class="submessage">Visit <a href="https://www.nagios.org/download/" target="_blank">nagios.org</a> to download Nagios <?php echo $updateinfo['update_version'];?>.</div>
- </div>
-<?php
- }
diff --git a/net-mgmt/nagios4/files/pkg-message.in b/net-mgmt/nagios4/files/pkg-message.in
index 5072529e92d1..45045fd7fe04 100644
--- a/net-mgmt/nagios4/files/pkg-message.in
+++ b/net-mgmt/nagios4/files/pkg-message.in
@@ -7,24 +7,24 @@
Configuration templates are available in %%ETCDIR%% as
*.cfg-sample files. Copy them to *.cfg files where required and
edit to suit your needs. Documentation is available in HTML form
- in %%NAGIOSWWWDIR%%/docs.
+ in %%WWWDIR%%/docs.
If you don't already have a web server running, you will need to
install and configure one to finish off your Nagios installation.
When used with Apache, the following should be sufficient to publish
the web component of Nagios (modify the allow list to suit):
- <Directory %%NAGIOSWWWDIR%%>
+ <Directory %%WWWDIR%%>
Require ip 127.0.0.1
php_flag engine on
- php_admin_value open_basedir %%NAGIOSWWWDIR%%/:%%NAGIOSDIR%%/
+ php_admin_value open_basedir %%WWWDIR%%/:%%NAGIOSDIR%%/
</Directory>
- <Directory %%NAGIOSWWWDIR%%/cgi-bin>
+ <Directory %%WWWDIR%%/cgi-bin>
Options ExecCGI
</Directory>
- ScriptAlias %%NAGIOSCGIURL%%/ %%NAGIOSWWWDIR%%/cgi-bin/
- Alias %%NAGIOSHTMURL%%/ %%NAGIOSWWWDIR%%/
+ ScriptAlias %%NAGIOSCGIURL%%/ %%WWWDIR%%/cgi-bin/
+ Alias %%NAGIOSHTMURL%%/ %%WWWDIR%%/
**********************************************************************
diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist
index 0dd610be32dc..a12856aefa18 100644
--- a/net-mgmt/nagios4/pkg-plist
+++ b/net-mgmt/nagios4/pkg-plist
@@ -9,380 +9,422 @@ bin/nagiostats
%%ETCDIR%%/objects/switch.cfg-sample
%%ETCDIR%%/objects/templates.cfg-sample
%%ETCDIR%%/objects/timeperiods.cfg-sample
+%%ETCDIR%%/objects/windows.cfg-sample
%%ETCDIR%%/resource.cfg-sample
-%%NAGIOSWWWDIR%%/cgi-bin/archivejson.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/config.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/extinfo.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/histogram.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/history.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/notifications.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/objectjson.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/outages.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/showlog.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/status.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/statusjson.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/statusmap.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/statuswml.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/summary.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/tac.cgi
-%%NAGIOSWWWDIR%%/cgi-bin/trends.cgi
-@sample %%NAGIOSWWWDIR%%/config.inc.php.sample
-%%NAGIOSWWWDIR%%/contexthelp/A1.html
-%%NAGIOSWWWDIR%%/contexthelp/A2.html
-%%NAGIOSWWWDIR%%/contexthelp/A3.html
-%%NAGIOSWWWDIR%%/contexthelp/A4.html
-%%NAGIOSWWWDIR%%/contexthelp/A5.html
-%%NAGIOSWWWDIR%%/contexthelp/A6.html
-%%NAGIOSWWWDIR%%/contexthelp/A7.html
-%%NAGIOSWWWDIR%%/contexthelp/B1.html
-%%NAGIOSWWWDIR%%/contexthelp/C1.html
-%%NAGIOSWWWDIR%%/contexthelp/D1.html
-%%NAGIOSWWWDIR%%/contexthelp/E1.html
-%%NAGIOSWWWDIR%%/contexthelp/F1.html
-%%NAGIOSWWWDIR%%/contexthelp/G1.html
-%%NAGIOSWWWDIR%%/contexthelp/G2.html
-%%NAGIOSWWWDIR%%/contexthelp/G3.html
-%%NAGIOSWWWDIR%%/contexthelp/G4.html
-%%NAGIOSWWWDIR%%/contexthelp/G5.html
-%%NAGIOSWWWDIR%%/contexthelp/G6.html
-%%NAGIOSWWWDIR%%/contexthelp/H1.html
-%%NAGIOSWWWDIR%%/contexthelp/H2.html
-%%NAGIOSWWWDIR%%/contexthelp/H3.html
-%%NAGIOSWWWDIR%%/contexthelp/H4.html
-%%NAGIOSWWWDIR%%/contexthelp/H5.html
-%%NAGIOSWWWDIR%%/contexthelp/H6.html
-%%NAGIOSWWWDIR%%/contexthelp/H7.html
-%%NAGIOSWWWDIR%%/contexthelp/H8.html
-%%NAGIOSWWWDIR%%/contexthelp/I1.html
-%%NAGIOSWWWDIR%%/contexthelp/I2.html
-%%NAGIOSWWWDIR%%/contexthelp/I3.html
-%%NAGIOSWWWDIR%%/contexthelp/I4.html
-%%NAGIOSWWWDIR%%/contexthelp/I5.html
-%%NAGIOSWWWDIR%%/contexthelp/I6.html
-%%NAGIOSWWWDIR%%/contexthelp/I7.html
-%%NAGIOSWWWDIR%%/contexthelp/I8.html
-%%NAGIOSWWWDIR%%/contexthelp/I9.html
-%%NAGIOSWWWDIR%%/contexthelp/J1.html
-%%NAGIOSWWWDIR%%/contexthelp/K1.html
-%%NAGIOSWWWDIR%%/contexthelp/L1.html
-%%NAGIOSWWWDIR%%/contexthelp/L10.html
-%%NAGIOSWWWDIR%%/contexthelp/L11.html
-%%NAGIOSWWWDIR%%/contexthelp/L12.html
-%%NAGIOSWWWDIR%%/contexthelp/L13.html
-%%NAGIOSWWWDIR%%/contexthelp/L2.html
-%%NAGIOSWWWDIR%%/contexthelp/L3.html
-%%NAGIOSWWWDIR%%/contexthelp/L4.html
-%%NAGIOSWWWDIR%%/contexthelp/L5.html
-%%NAGIOSWWWDIR%%/contexthelp/L6.html
-%%NAGIOSWWWDIR%%/contexthelp/L7.html
-%%NAGIOSWWWDIR%%/contexthelp/L8.html
-%%NAGIOSWWWDIR%%/contexthelp/L9.html
-%%NAGIOSWWWDIR%%/contexthelp/M1.html
-%%NAGIOSWWWDIR%%/contexthelp/M2.html
-%%NAGIOSWWWDIR%%/contexthelp/M3.html
-%%NAGIOSWWWDIR%%/contexthelp/M4.html
-%%NAGIOSWWWDIR%%/contexthelp/M5.html
-%%NAGIOSWWWDIR%%/contexthelp/M6.html
-%%NAGIOSWWWDIR%%/contexthelp/N1.html
-%%NAGIOSWWWDIR%%/contexthelp/N2.html
-%%NAGIOSWWWDIR%%/contexthelp/N3.html
-%%NAGIOSWWWDIR%%/contexthelp/N4.html
-%%NAGIOSWWWDIR%%/contexthelp/N5.html
-%%NAGIOSWWWDIR%%/contexthelp/N6.html
-%%NAGIOSWWWDIR%%/contexthelp/N7.html
-%%NAGIOSWWWDIR%%/images/Nagios-clearbg.png
-%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
-%%NAGIOSWWWDIR%%/images/ack.gif
-%%NAGIOSWWWDIR%%/images/action-graph.gif
-%%NAGIOSWWWDIR%%/images/action-nagios.gif
-%%NAGIOSWWWDIR%%/images/action-orig.gif
-%%NAGIOSWWWDIR%%/images/action.gif
-%%NAGIOSWWWDIR%%/images/b_first2.png
-%%NAGIOSWWWDIR%%/images/b_last2.png
-%%NAGIOSWWWDIR%%/images/b_next2.png
-%%NAGIOSWWWDIR%%/images/b_prev2.png
-%%NAGIOSWWWDIR%%/images/command.png
-%%NAGIOSWWWDIR%%/images/comment.gif
-%%NAGIOSWWWDIR%%/images/contexthelp1.gif
-%%NAGIOSWWWDIR%%/images/contexthelp2.gif
-%%NAGIOSWWWDIR%%/images/critical.png
-%%NAGIOSWWWDIR%%/images/delay.gif
-%%NAGIOSWWWDIR%%/images/delete.gif
-%%NAGIOSWWWDIR%%/images/detail.gif
-%%NAGIOSWWWDIR%%/images/disabled.gif
-%%NAGIOSWWWDIR%%/images/down.gif
-%%NAGIOSWWWDIR%%/images/downtime.gif
-%%NAGIOSWWWDIR%%/images/empty.gif
-%%NAGIOSWWWDIR%%/images/enabled.gif
-%%NAGIOSWWWDIR%%/images/extinfo.gif
-%%NAGIOSWWWDIR%%/images/favicon.ico
-%%NAGIOSWWWDIR%%/images/flapping.gif
-%%NAGIOSWWWDIR%%/images/globe-support-150x150.png
-%%NAGIOSWWWDIR%%/images/graph.gif
-%%NAGIOSWWWDIR%%/images/greendot.gif
-%%NAGIOSWWWDIR%%/images/histogram.png
-%%NAGIOSWWWDIR%%/images/history.gif
-%%NAGIOSWWWDIR%%/images/hostevent.gif
-%%NAGIOSWWWDIR%%/images/info.png
-%%NAGIOSWWWDIR%%/images/left.gif
-%%NAGIOSWWWDIR%%/images/logofullsize.png
-%%NAGIOSWWWDIR%%/images/logos/aix.gd2
-%%NAGIOSWWWDIR%%/images/logos/aix.gif
-%%NAGIOSWWWDIR%%/images/logos/aix.jpg
-%%NAGIOSWWWDIR%%/images/logos/aix.png
-%%NAGIOSWWWDIR%%/images/logos/amiga.gd2
-%%NAGIOSWWWDIR%%/images/logos/amiga.gif
-%%NAGIOSWWWDIR%%/images/logos/amiga.jpg
-%%NAGIOSWWWDIR%%/images/logos/amiga.png
-%%NAGIOSWWWDIR%%/images/logos/apple.gd2
-%%NAGIOSWWWDIR%%/images/logos/apple.gif
-%%NAGIOSWWWDIR%%/images/logos/apple.jpg
-%%NAGIOSWWWDIR%%/images/logos/apple.png
-%%NAGIOSWWWDIR%%/images/logos/beos.gd2
-%%NAGIOSWWWDIR%%/images/logos/beos.gif
-%%NAGIOSWWWDIR%%/images/logos/beos.jpg
-%%NAGIOSWWWDIR%%/images/logos/beos.png
-%%NAGIOSWWWDIR%%/images/logos/bluetooth.png
-%%NAGIOSWWWDIR%%/images/logos/caldera.gd2
-%%NAGIOSWWWDIR%%/images/logos/caldera.gif
-%%NAGIOSWWWDIR%%/images/logos/caldera.jpg
-%%NAGIOSWWWDIR%%/images/logos/caldera.png
-%%NAGIOSWWWDIR%%/images/logos/cat1900.gd2
-%%NAGIOSWWWDIR%%/images/logos/cat2900.gd2
-%%NAGIOSWWWDIR%%/images/logos/cat5000.gd2
-%%NAGIOSWWWDIR%%/images/logos/database.gd2
-%%NAGIOSWWWDIR%%/images/logos/database.gif
-%%NAGIOSWWWDIR%%/images/logos/debian.gd2
-%%NAGIOSWWWDIR%%/images/logos/debian.gif
-%%NAGIOSWWWDIR%%/images/logos/debian.jpg
-%%NAGIOSWWWDIR%%/images/logos/debian.png
-%%NAGIOSWWWDIR%%/images/logos/desktop-server.gd2
-%%NAGIOSWWWDIR%%/images/logos/desktop-server.gif
-%%NAGIOSWWWDIR%%/images/logos/ethernet_card.png
-%%NAGIOSWWWDIR%%/images/logos/fax.gd2
-%%NAGIOSWWWDIR%%/images/logos/fax.gif
-%%NAGIOSWWWDIR%%/images/logos/firewall.gd2
-%%NAGIOSWWWDIR%%/images/logos/firewall.gif
-%%NAGIOSWWWDIR%%/images/logos/freebsd40.gd2
-%%NAGIOSWWWDIR%%/images/logos/freebsd40.gif
-%%NAGIOSWWWDIR%%/images/logos/freebsd40.jpg
-%%NAGIOSWWWDIR%%/images/logos/freebsd40.png
-%%NAGIOSWWWDIR%%/images/logos/globe.png
-%%NAGIOSWWWDIR%%/images/logos/graph.gif
-%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gd2
-%%NAGIOSWWWDIR%%/images/logos/hp-printer40.gif
-%%NAGIOSWWWDIR%%/images/logos/hp-printer40.jpg
-%%NAGIOSWWWDIR%%/images/logos/hp-printer40.png
-%%NAGIOSWWWDIR%%/images/logos/hpux.gd2
-%%NAGIOSWWWDIR%%/images/logos/hpux.gif
-%%NAGIOSWWWDIR%%/images/logos/hpux.jpg
-%%NAGIOSWWWDIR%%/images/logos/hpux.png
-%%NAGIOSWWWDIR%%/images/logos/hub.gd2
-%%NAGIOSWWWDIR%%/images/logos/hub.gif
-%%NAGIOSWWWDIR%%/images/logos/internet.gd2
-%%NAGIOSWWWDIR%%/images/logos/internet.gif
-%%NAGIOSWWWDIR%%/images/logos/internet_device.png
-%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gd2
-%%NAGIOSWWWDIR%%/images/logos/ip-pbx.gif
-%%NAGIOSWWWDIR%%/images/logos/irix.gd2
-%%NAGIOSWWWDIR%%/images/logos/irix.gif
-%%NAGIOSWWWDIR%%/images/logos/irix.jpg
-%%NAGIOSWWWDIR%%/images/logos/irix.png
-%%NAGIOSWWWDIR%%/images/logos/linux40.gd2
-%%NAGIOSWWWDIR%%/images/logos/linux40.gif
-%%NAGIOSWWWDIR%%/images/logos/linux40.jpg
-%%NAGIOSWWWDIR%%/images/logos/linux40.png
-%%NAGIOSWWWDIR%%/images/logos/logo.gd2
-%%NAGIOSWWWDIR%%/images/logos/mac40.gd2
-%%NAGIOSWWWDIR%%/images/logos/mac40.gif
-%%NAGIOSWWWDIR%%/images/logos/mac40.jpg
-%%NAGIOSWWWDIR%%/images/logos/mac40.png
-%%NAGIOSWWWDIR%%/images/logos/mainframe.gd2
-%%NAGIOSWWWDIR%%/images/logos/mainframe.gif
-%%NAGIOSWWWDIR%%/images/logos/mandrake.gd2
-%%NAGIOSWWWDIR%%/images/logos/mandrake.gif
-%%NAGIOSWWWDIR%%/images/logos/mandrake.jpg
-%%NAGIOSWWWDIR%%/images/logos/mandrake.png
-%%NAGIOSWWWDIR%%/images/logos/monitor.png
-%%NAGIOSWWWDIR%%/images/logos/nagios.gd2
-%%NAGIOSWWWDIR%%/images/logos/nagios.gif
-%%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png
-%%NAGIOSWWWDIR%%/images/logos/next.gd2
-%%NAGIOSWWWDIR%%/images/logos/next.gif
-%%NAGIOSWWWDIR%%/images/logos/next.jpg
-%%NAGIOSWWWDIR%%/images/logos/next.png
-%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gd2
-%%NAGIOSWWWDIR%%/images/logos/ng-switch40.gif
-%%NAGIOSWWWDIR%%/images/logos/ng-switch40.jpg
-%%NAGIOSWWWDIR%%/images/logos/ng-switch40.png
-%%NAGIOSWWWDIR%%/images/logos/notebook.gd2
-%%NAGIOSWWWDIR%%/images/logos/notebook.gif
-%%NAGIOSWWWDIR%%/images/logos/novell40.gd2
-%%NAGIOSWWWDIR%%/images/logos/novell40.gif
-%%NAGIOSWWWDIR%%/images/logos/novell40.jpg
-%%NAGIOSWWWDIR%%/images/logos/novell40.png
-%%NAGIOSWWWDIR%%/images/logos/openbsd.gd2
-%%NAGIOSWWWDIR%%/images/logos/openbsd.gif
-%%NAGIOSWWWDIR%%/images/logos/openbsd.jpg
-%%NAGIOSWWWDIR%%/images/logos/openbsd.png
-%%NAGIOSWWWDIR%%/images/logos/printer.gd2
-%%NAGIOSWWWDIR%%/images/logos/printer.gif
-%%NAGIOSWWWDIR%%/images/logos/rack-server.gd2
-%%NAGIOSWWWDIR%%/images/logos/rack-server.gif
-%%NAGIOSWWWDIR%%/images/logos/redhat.gd2
-%%NAGIOSWWWDIR%%/images/logos/redhat.gif
-%%NAGIOSWWWDIR%%/images/logos/redhat.jpg
-%%NAGIOSWWWDIR%%/images/logos/redhat.png
-%%NAGIOSWWWDIR%%/images/logos/router.gd2
-%%NAGIOSWWWDIR%%/images/logos/router.gif
-%%NAGIOSWWWDIR%%/images/logos/router40.gd2
-%%NAGIOSWWWDIR%%/images/logos/router40.gif
-%%NAGIOSWWWDIR%%/images/logos/router40.jpg
-%%NAGIOSWWWDIR%%/images/logos/router40.png
-%%NAGIOSWWWDIR%%/images/logos/san.gd2
-%%NAGIOSWWWDIR%%/images/logos/san.gif
-%%NAGIOSWWWDIR%%/images/logos/satellite.png
-%%NAGIOSWWWDIR%%/images/logos/server.png
-%%NAGIOSWWWDIR%%/images/logos/signal.png
-%%NAGIOSWWWDIR%%/images/logos/slackware.gd2
-%%NAGIOSWWWDIR%%/images/logos/slackware.gif
-%%NAGIOSWWWDIR%%/images/logos/slackware.jpg
-%%NAGIOSWWWDIR%%/images/logos/slackware.png
-%%NAGIOSWWWDIR%%/images/logos/stampede.gd2
-%%NAGIOSWWWDIR%%/images/logos/stampede.gif
-%%NAGIOSWWWDIR%%/images/logos/stampede.jpg
-%%NAGIOSWWWDIR%%/images/logos/stampede.png
-%%NAGIOSWWWDIR%%/images/logos/station.gd2
-%%NAGIOSWWWDIR%%/images/logos/storm.gd2
-%%NAGIOSWWWDIR%%/images/logos/storm.gif
-%%NAGIOSWWWDIR%%/images/logos/storm.jpg
-%%NAGIOSWWWDIR%%/images/logos/storm.png
-%%NAGIOSWWWDIR%%/images/logos/sun40.gd2
-%%NAGIOSWWWDIR%%/images/logos/sun40.gif
-%%NAGIOSWWWDIR%%/images/logos/sun40.jpg
-%%NAGIOSWWWDIR%%/images/logos/sun40.png
-%%NAGIOSWWWDIR%%/images/logos/sunlogo.gd2
-%%NAGIOSWWWDIR%%/images/logos/sunlogo.gif
-%%NAGIOSWWWDIR%%/images/logos/sunlogo.jpg
-%%NAGIOSWWWDIR%%/images/logos/sunlogo.png
-%%NAGIOSWWWDIR%%/images/logos/switch.gd2
-%%NAGIOSWWWDIR%%/images/logos/switch.gif
-%%NAGIOSWWWDIR%%/images/logos/switch40.gd2
-%%NAGIOSWWWDIR%%/images/logos/switch40.gif
-%%NAGIOSWWWDIR%%/images/logos/switch40.jpg
-%%NAGIOSWWWDIR%%/images/logos/switch40.png
-%%NAGIOSWWWDIR%%/images/logos/thin-client.gd2
-%%NAGIOSWWWDIR%%/images/logos/thin-client.gif
-%%NAGIOSWWWDIR%%/images/logos/turbolinux.gd2
-%%NAGIOSWWWDIR%%/images/logos/turbolinux.gif
-%%NAGIOSWWWDIR%%/images/logos/turbolinux.jpg
-%%NAGIOSWWWDIR%%/images/logos/turbolinux.png
-%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gd2
-%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.gif
-%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.jpg
-%%NAGIOSWWWDIR%%/images/logos/ultrapenguin.png
-%%NAGIOSWWWDIR%%/images/logos/unicos.gd2
-%%NAGIOSWWWDIR%%/images/logos/unicos.gif
-%%NAGIOSWWWDIR%%/images/logos/unicos.jpg
-%%NAGIOSWWWDIR%%/images/logos/unicos.png
-%%NAGIOSWWWDIR%%/images/logos/unknown.gd2
-%%NAGIOSWWWDIR%%/images/logos/unknown.gif
-%%NAGIOSWWWDIR%%/images/logos/webcamera.png
-%%NAGIOSWWWDIR%%/images/logos/wifi.gd2
-%%NAGIOSWWWDIR%%/images/logos/wifi.gif
-%%NAGIOSWWWDIR%%/images/logos/wifi_modem.png
-%%NAGIOSWWWDIR%%/images/logos/win40.gd2
-%%NAGIOSWWWDIR%%/images/logos/win40.gif
-%%NAGIOSWWWDIR%%/images/logos/win40.jpg
-%%NAGIOSWWWDIR%%/images/logos/win40.png
-%%NAGIOSWWWDIR%%/images/logos/workstation.gd2
-%%NAGIOSWWWDIR%%/images/logos/workstation.gif
-%%NAGIOSWWWDIR%%/images/logos/workstation.png
-%%NAGIOSWWWDIR%%/images/logos/workstation_locked.png
-%%NAGIOSWWWDIR%%/images/logos/yellowdog.gd2
-%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
-%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
-%%NAGIOSWWWDIR%%/images/logos/yellowdog.png
-%%NAGIOSWWWDIR%%/images/logrotate.png
-%%NAGIOSWWWDIR%%/images/ndisabled.gif
-%%NAGIOSWWWDIR%%/images/noack.gif
-%%NAGIOSWWWDIR%%/images/notes.gif
-%%NAGIOSWWWDIR%%/images/notify.gif
-%%NAGIOSWWWDIR%%/images/orangedot.gif
-%%NAGIOSWWWDIR%%/images/passiveonly.gif
-%%NAGIOSWWWDIR%%/images/recovery.png
-%%NAGIOSWWWDIR%%/images/redudancy.png
-%%NAGIOSWWWDIR%%/images/redundancy.png
-%%NAGIOSWWWDIR%%/images/restart.gif
-%%NAGIOSWWWDIR%%/images/right.gif
-%%NAGIOSWWWDIR%%/images/sblogo.png
-%%NAGIOSWWWDIR%%/images/serviceevent.gif
-%%NAGIOSWWWDIR%%/images/sflogo.png
-%%NAGIOSWWWDIR%%/images/splunk1.gif
-%%NAGIOSWWWDIR%%/images/splunk2.gif
-%%NAGIOSWWWDIR%%/images/start.gif
-%%NAGIOSWWWDIR%%/images/status.gif
-%%NAGIOSWWWDIR%%/images/status2.gif
-%%NAGIOSWWWDIR%%/images/status3.gif
-%%NAGIOSWWWDIR%%/images/status4.gif
-%%NAGIOSWWWDIR%%/images/stop.gif
-%%NAGIOSWWWDIR%%/images/tacdisabled.jpg
-%%NAGIOSWWWDIR%%/images/tacdisabled.png
-%%NAGIOSWWWDIR%%/images/tacenabled.jpg
-%%NAGIOSWWWDIR%%/images/tacenabled.png
-%%NAGIOSWWWDIR%%/images/thermcrit.png
-%%NAGIOSWWWDIR%%/images/thermok.png
-%%NAGIOSWWWDIR%%/images/thermwarn.png
-%%NAGIOSWWWDIR%%/images/trends.gif
-%%NAGIOSWWWDIR%%/images/trendshost.png
-%%NAGIOSWWWDIR%%/images/trendssvc.png
-%%NAGIOSWWWDIR%%/images/unknown.png
-%%NAGIOSWWWDIR%%/images/up.gif
-%%NAGIOSWWWDIR%%/images/warning.png
-%%NAGIOSWWWDIR%%/images/weblogo1.png
-%%NAGIOSWWWDIR%%/images/zoom1.gif
-%%NAGIOSWWWDIR%%/images/zoom2.gif
-%%NAGIOSWWWDIR%%/includes/jquery-1.7.1.min.js
-%%NAGIOSWWWDIR%%/includes/rss/extlib/Snoopy.class.inc
-%%NAGIOSWWWDIR%%/includes/rss/rss_cache.inc
-%%NAGIOSWWWDIR%%/includes/rss/rss_fetch.inc
-%%NAGIOSWWWDIR%%/includes/rss/rss_parse.inc
-%%NAGIOSWWWDIR%%/includes/rss/rss_utils.inc
-%%NAGIOSWWWDIR%%/includes/utils.inc.php
-%%NAGIOSWWWDIR%%/index.php
-%%NAGIOSWWWDIR%%/js/jquery-1.7.1.min.js
-%%NAGIOSWWWDIR%%/js/jsonquery.js
-%%NAGIOSWWWDIR%%/jsonquery.html
-%%NAGIOSWWWDIR%%/main.php
-%%NAGIOSWWWDIR%%/robots.txt
-%%NAGIOSWWWDIR%%/rss-corebanner.php
-%%NAGIOSWWWDIR%%/rss-corefeed.html
-%%NAGIOSWWWDIR%%/rss-corefeed.php
-%%NAGIOSWWWDIR%%/rss-newsfeed.html
-%%NAGIOSWWWDIR%%/rss-newsfeed.php
-%%NAGIOSWWWDIR%%/side.php
-%%NAGIOSWWWDIR%%/stylesheets/avail.css
-%%NAGIOSWWWDIR%%/stylesheets/checksanity.css
-%%NAGIOSWWWDIR%%/stylesheets/cmd.css
-%%NAGIOSWWWDIR%%/stylesheets/common.css
-%%NAGIOSWWWDIR%%/stylesheets/config.css
-%%NAGIOSWWWDIR%%/stylesheets/extinfo.css
-%%NAGIOSWWWDIR%%/stylesheets/histogram.css
-%%NAGIOSWWWDIR%%/stylesheets/history.css
-%%NAGIOSWWWDIR%%/stylesheets/jsonquery.css
-%%NAGIOSWWWDIR%%/stylesheets/ministatus.css
-%%NAGIOSWWWDIR%%/stylesheets/notifications.css
-%%NAGIOSWWWDIR%%/stylesheets/outages.css
-%%NAGIOSWWWDIR%%/stylesheets/showlog.css
-%%NAGIOSWWWDIR%%/stylesheets/status.css
-%%NAGIOSWWWDIR%%/stylesheets/statusmap.css
-%%NAGIOSWWWDIR%%/stylesheets/summary.css
-%%NAGIOSWWWDIR%%/stylesheets/tac.css
-%%NAGIOSWWWDIR%%/stylesheets/trends.css
-@dir libexec/nagios
-@dir %%NAGIOSWWWDIR%%/ssi
+%%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js
+%%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js.map
+%%WWWDIR%%/angularjs/ui-bootstrap-tpls-0.12.0.min.js
+%%WWWDIR%%/angularjs/ui-utils-0.2.1/ui-utils.js
+%%WWWDIR%%/bootstrap-3.3.0/css/bootstrap-theme.min.css
+%%WWWDIR%%/bootstrap-3.3.0/css/bootstrap.min.css
+%%WWWDIR%%/cgi-bin/archivejson.cgi
+%%WWWDIR%%/cgi-bin/avail.cgi
+%%WWWDIR%%/cgi-bin/cmd.cgi
+%%WWWDIR%%/cgi-bin/config.cgi
+%%WWWDIR%%/cgi-bin/extinfo.cgi
+%%WWWDIR%%/cgi-bin/histogram.cgi
+%%WWWDIR%%/cgi-bin/history.cgi
+%%WWWDIR%%/cgi-bin/notifications.cgi
+%%WWWDIR%%/cgi-bin/objectjson.cgi
+%%WWWDIR%%/cgi-bin/outages.cgi
+%%WWWDIR%%/cgi-bin/showlog.cgi
+%%WWWDIR%%/cgi-bin/status.cgi
+%%WWWDIR%%/cgi-bin/statusjson.cgi
+%%WWWDIR%%/cgi-bin/statusmap.cgi
+%%WWWDIR%%/cgi-bin/statuswml.cgi
+%%WWWDIR%%/cgi-bin/summary.cgi
+%%WWWDIR%%/cgi-bin/tac.cgi
+%%WWWDIR%%/cgi-bin/trends.cgi
+@sample %%WWWDIR%%/config.inc.php.sample
+%%WWWDIR%%/contexthelp/A1.html
+%%WWWDIR%%/contexthelp/A2.html
+%%WWWDIR%%/contexthelp/A3.html
+%%WWWDIR%%/contexthelp/A4.html
+%%WWWDIR%%/contexthelp/A5.html
+%%WWWDIR%%/contexthelp/A6.html
+%%WWWDIR%%/contexthelp/A7.html
+%%WWWDIR%%/contexthelp/B1.html
+%%WWWDIR%%/contexthelp/C1.html
+%%WWWDIR%%/contexthelp/D1.html
+%%WWWDIR%%/contexthelp/E1.html
+%%WWWDIR%%/contexthelp/F1.html
+%%WWWDIR%%/contexthelp/G1.html
+%%WWWDIR%%/contexthelp/G2.html
+%%WWWDIR%%/contexthelp/G3.html
+%%WWWDIR%%/contexthelp/G4.html
+%%WWWDIR%%/contexthelp/G5.html
+%%WWWDIR%%/contexthelp/G6.html
+%%WWWDIR%%/contexthelp/H1.html
+%%WWWDIR%%/contexthelp/H2.html
+%%WWWDIR%%/contexthelp/H3.html
+%%WWWDIR%%/contexthelp/H4.html
+%%WWWDIR%%/contexthelp/H5.html
+%%WWWDIR%%/contexthelp/H6.html
+%%WWWDIR%%/contexthelp/H7.html
+%%WWWDIR%%/contexthelp/H8.html
+%%WWWDIR%%/contexthelp/I1.html
+%%WWWDIR%%/contexthelp/I2.html
+%%WWWDIR%%/contexthelp/I3.html
+%%WWWDIR%%/contexthelp/I4.html
+%%WWWDIR%%/contexthelp/I5.html
+%%WWWDIR%%/contexthelp/I6.html
+%%WWWDIR%%/contexthelp/I7.html
+%%WWWDIR%%/contexthelp/I8.html
+%%WWWDIR%%/contexthelp/I9.html
+%%WWWDIR%%/contexthelp/J1.html
+%%WWWDIR%%/contexthelp/K1.html
+%%WWWDIR%%/contexthelp/L1.html
+%%WWWDIR%%/contexthelp/L10.html
+%%WWWDIR%%/contexthelp/L11.html
+%%WWWDIR%%/contexthelp/L12.html
+%%WWWDIR%%/contexthelp/L13.html
+%%WWWDIR%%/contexthelp/L2.html
+%%WWWDIR%%/contexthelp/L3.html
+%%WWWDIR%%/contexthelp/L4.html
+%%WWWDIR%%/contexthelp/L5.html
+%%WWWDIR%%/contexthelp/L6.html
+%%WWWDIR%%/contexthelp/L7.html
+%%WWWDIR%%/contexthelp/L8.html
+%%WWWDIR%%/contexthelp/L9.html
+%%WWWDIR%%/contexthelp/M1.html
+%%WWWDIR%%/contexthelp/M2.html
+%%WWWDIR%%/contexthelp/M3.html
+%%WWWDIR%%/contexthelp/M4.html
+%%WWWDIR%%/contexthelp/M5.html
+%%WWWDIR%%/contexthelp/M6.html
+%%WWWDIR%%/contexthelp/N1.html
+%%WWWDIR%%/contexthelp/N2.html
+%%WWWDIR%%/contexthelp/N3.html
+%%WWWDIR%%/contexthelp/N4.html
+%%WWWDIR%%/contexthelp/N5.html
+%%WWWDIR%%/contexthelp/N6.html
+%%WWWDIR%%/contexthelp/N7.html
+%%WWWDIR%%/d3/d3.min.js
+%%WWWDIR%%/graph-header.html
+%%WWWDIR%%/histogram-form.html
+%%WWWDIR%%/histogram-graph.html
+%%WWWDIR%%/histogram-links.html
+%%WWWDIR%%/histogram.html
+%%WWWDIR%%/images/Nagios-clearbg.png
+%%WWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png
+%%WWWDIR%%/images/ack.gif
+%%WWWDIR%%/images/action-graph.gif
+%%WWWDIR%%/images/action-nagios.gif
+%%WWWDIR%%/images/action-orig.gif
+%%WWWDIR%%/images/action.gif
+%%WWWDIR%%/images/b_first2.png
+%%WWWDIR%%/images/b_last2.png
+%%WWWDIR%%/images/b_next2.png
+%%WWWDIR%%/images/b_prev2.png
+%%WWWDIR%%/images/command.png
+%%WWWDIR%%/images/comment.gif
+%%WWWDIR%%/images/contexthelp1.gif
+%%WWWDIR%%/images/contexthelp2.gif
+%%WWWDIR%%/images/critical.png
+%%WWWDIR%%/images/delay.gif
+%%WWWDIR%%/images/delete.gif
+%%WWWDIR%%/images/detail.gif
+%%WWWDIR%%/images/disabled.gif
+%%WWWDIR%%/images/down.gif
+%%WWWDIR%%/images/downtime.gif
+%%WWWDIR%%/images/empty.gif
+%%WWWDIR%%/images/enabled.gif
+%%WWWDIR%%/images/extinfo.gif
+%%WWWDIR%%/images/favicon.ico
+%%WWWDIR%%/images/flapping.gif
+%%WWWDIR%%/images/globe-support-150x150.png
+%%WWWDIR%%/images/graph.gif
+%%WWWDIR%%/images/greendot.gif
+%%WWWDIR%%/images/histogram.png
+%%WWWDIR%%/images/history.gif
+%%WWWDIR%%/images/hostevent.gif
+%%WWWDIR%%/images/info.png
+%%WWWDIR%%/images/left.gif
+%%WWWDIR%%/images/logofullsize.png
+%%WWWDIR%%/images/logos/aix.gd2
+%%WWWDIR%%/images/logos/aix.gif
+%%WWWDIR%%/images/logos/aix.jpg
+%%WWWDIR%%/images/logos/aix.png
+%%WWWDIR%%/images/logos/amiga.gd2
+%%WWWDIR%%/images/logos/amiga.gif
+%%WWWDIR%%/images/logos/amiga.jpg
+%%WWWDIR%%/images/logos/amiga.png
+%%WWWDIR%%/images/logos/apple.gd2
+%%WWWDIR%%/images/logos/apple.gif
+%%WWWDIR%%/images/logos/apple.jpg
+%%WWWDIR%%/images/logos/apple.png
+%%WWWDIR%%/images/logos/beos.gd2
+%%WWWDIR%%/images/logos/beos.gif
+%%WWWDIR%%/images/logos/beos.jpg
+%%WWWDIR%%/images/logos/beos.png
+%%WWWDIR%%/images/logos/bluetooth.png
+%%WWWDIR%%/images/logos/caldera.gd2
+%%WWWDIR%%/images/logos/caldera.gif
+%%WWWDIR%%/images/logos/caldera.jpg
+%%WWWDIR%%/images/logos/caldera.png
+%%WWWDIR%%/images/logos/cat1900.gd2
+%%WWWDIR%%/images/logos/cat2900.gd2
+%%WWWDIR%%/images/logos/cat5000.gd2
+%%WWWDIR%%/images/logos/database.gd2
+%%WWWDIR%%/images/logos/database.gif
+%%WWWDIR%%/images/logos/debian.gd2
+%%WWWDIR%%/images/logos/debian.gif
+%%WWWDIR%%/images/logos/debian.jpg
+%%WWWDIR%%/images/logos/debian.png
+%%WWWDIR%%/images/logos/desktop-server.gd2
+%%WWWDIR%%/images/logos/desktop-server.gif
+%%WWWDIR%%/images/logos/ethernet_card.png
+%%WWWDIR%%/images/logos/fax.gd2
+%%WWWDIR%%/images/logos/fax.gif
+%%WWWDIR%%/images/logos/firewall.gd2
+%%WWWDIR%%/images/logos/firewall.gif
+%%WWWDIR%%/images/logos/freebsd40.gd2
+%%WWWDIR%%/images/logos/freebsd40.gif
+%%WWWDIR%%/images/logos/freebsd40.jpg
+%%WWWDIR%%/images/logos/freebsd40.png
+%%WWWDIR%%/images/logos/globe.png
+%%WWWDIR%%/images/logos/graph.gif
+%%WWWDIR%%/images/logos/hp-printer40.gd2
+%%WWWDIR%%/images/logos/hp-printer40.gif
+%%WWWDIR%%/images/logos/hp-printer40.jpg
+%%WWWDIR%%/images/logos/hp-printer40.png
+%%WWWDIR%%/images/logos/hpux.gd2
+%%WWWDIR%%/images/logos/hpux.gif
+%%WWWDIR%%/images/logos/hpux.jpg
+%%WWWDIR%%/images/logos/hpux.png
+%%WWWDIR%%/images/logos/hub.gd2
+%%WWWDIR%%/images/logos/hub.gif
+%%WWWDIR%%/images/logos/internet.gd2
+%%WWWDIR%%/images/logos/internet.gif
+%%WWWDIR%%/images/logos/internet_device.png
+%%WWWDIR%%/images/logos/ip-pbx.gd2
+%%WWWDIR%%/images/logos/ip-pbx.gif
+%%WWWDIR%%/images/logos/irix.gd2
+%%WWWDIR%%/images/logos/irix.gif
+%%WWWDIR%%/images/logos/irix.jpg
+%%WWWDIR%%/images/logos/irix.png
+%%WWWDIR%%/images/logos/linux40.gd2
+%%WWWDIR%%/images/logos/linux40.gif
+%%WWWDIR%%/images/logos/linux40.jpg
+%%WWWDIR%%/images/logos/linux40.png
+%%WWWDIR%%/images/logos/logo.gd2
+%%WWWDIR%%/images/logos/mac40.gd2
+%%WWWDIR%%/images/logos/mac40.gif
+%%WWWDIR%%/images/logos/mac40.jpg
+%%WWWDIR%%/images/logos/mac40.png
+%%WWWDIR%%/images/logos/mainframe.gd2
+%%WWWDIR%%/images/logos/mainframe.gif
+%%WWWDIR%%/images/logos/mandrake.gd2
+%%WWWDIR%%/images/logos/mandrake.gif
+%%WWWDIR%%/images/logos/mandrake.jpg
+%%WWWDIR%%/images/logos/mandrake.png
+%%WWWDIR%%/images/logos/monitor.png
+%%WWWDIR%%/images/logos/nagios.gd2
+%%WWWDIR%%/images/logos/nagios.gif
+%%WWWDIR%%/images/logos/nagiosvrml.png
+%%WWWDIR%%/images/logos/next.gd2
+%%WWWDIR%%/images/logos/next.gif
+%%WWWDIR%%/images/logos/next.jpg
+%%WWWDIR%%/images/logos/next.png
+%%WWWDIR%%/images/logos/ng-switch40.gd2
+%%WWWDIR%%/images/logos/ng-switch40.gif
+%%WWWDIR%%/images/logos/ng-switch40.jpg
+%%WWWDIR%%/images/logos/ng-switch40.png
+%%WWWDIR%%/images/logos/notebook.gd2
+%%WWWDIR%%/images/logos/notebook.gif
+%%WWWDIR%%/images/logos/novell40.gd2
+%%WWWDIR%%/images/logos/novell40.gif
+%%WWWDIR%%/images/logos/novell40.jpg
+%%WWWDIR%%/images/logos/novell40.png
+%%WWWDIR%%/images/logos/openbsd.gd2
+%%WWWDIR%%/images/logos/openbsd.gif
+%%WWWDIR%%/images/logos/openbsd.jpg
+%%WWWDIR%%/images/logos/openbsd.png
+%%WWWDIR%%/images/logos/printer.gd2
+%%WWWDIR%%/images/logos/printer.gif
+%%WWWDIR%%/images/logos/rack-server.gd2
+%%WWWDIR%%/images/logos/rack-server.gif
+%%WWWDIR%%/images/logos/redhat.gd2
+%%WWWDIR%%/images/logos/redhat.gif
+%%WWWDIR%%/images/logos/redhat.jpg
+%%WWWDIR%%/images/logos/redhat.png
+%%WWWDIR%%/images/logos/router.gd2
+%%WWWDIR%%/images/logos/router.gif
+%%WWWDIR%%/images/logos/router40.gd2
+%%WWWDIR%%/images/logos/router40.gif
+%%WWWDIR%%/images/logos/router40.jpg
+%%WWWDIR%%/images/logos/router40.png
+%%WWWDIR%%/images/logos/san.gd2
+%%WWWDIR%%/images/logos/san.gif
+%%WWWDIR%%/images/logos/satellite.png
+%%WWWDIR%%/images/logos/server.png
+%%WWWDIR%%/images/logos/signal.png
+%%WWWDIR%%/images/logos/slackware.gd2
+%%WWWDIR%%/images/logos/slackware.gif
+%%WWWDIR%%/images/logos/slackware.jpg
+%%WWWDIR%%/images/logos/slackware.png
+%%WWWDIR%%/images/logos/stampede.gd2
+%%WWWDIR%%/images/logos/stampede.gif
+%%WWWDIR%%/images/logos/stampede.jpg
+%%WWWDIR%%/images/logos/stampede.png
+%%WWWDIR%%/images/logos/station.gd2
+%%WWWDIR%%/images/logos/storm.gd2
+%%WWWDIR%%/images/logos/storm.gif
+%%WWWDIR%%/images/logos/storm.jpg
+%%WWWDIR%%/images/logos/storm.png
+%%WWWDIR%%/images/logos/sun40.gd2
+%%WWWDIR%%/images/logos/sun40.gif
+%%WWWDIR%%/images/logos/sun40.jpg
+%%WWWDIR%%/images/logos/sun40.png
+%%WWWDIR%%/images/logos/sunlogo.gd2
+%%WWWDIR%%/images/logos/sunlogo.gif
+%%WWWDIR%%/images/logos/sunlogo.jpg
+%%WWWDIR%%/images/logos/sunlogo.png
+%%WWWDIR%%/images/logos/switch.gd2
+%%WWWDIR%%/images/logos/switch.gif
+%%WWWDIR%%/images/logos/switch40.gd2
+%%WWWDIR%%/images/logos/switch40.gif
+%%WWWDIR%%/images/logos/switch40.jpg
+%%WWWDIR%%/images/logos/switch40.png
+%%WWWDIR%%/images/logos/thin-client.gd2
+%%WWWDIR%%/images/logos/thin-client.gif
+%%WWWDIR%%/images/logos/turbolinux.gd2
+%%WWWDIR%%/images/logos/turbolinux.gif
+%%WWWDIR%%/images/logos/turbolinux.jpg
+%%WWWDIR%%/images/logos/turbolinux.png
+%%WWWDIR%%/images/logos/ultrapenguin.gd2
+%%WWWDIR%%/images/logos/ultrapenguin.gif
+%%WWWDIR%%/images/logos/ultrapenguin.jpg
+%%WWWDIR%%/images/logos/ultrapenguin.png
+%%WWWDIR%%/images/logos/unicos.gd2
+%%WWWDIR%%/images/logos/unicos.gif
+%%WWWDIR%%/images/logos/unicos.jpg
+%%WWWDIR%%/images/logos/unicos.png
+%%WWWDIR%%/images/logos/unknown.gd2
+%%WWWDIR%%/images/logos/unknown.gif
+%%WWWDIR%%/images/logos/webcamera.png
+%%WWWDIR%%/images/logos/wifi.gd2
+%%WWWDIR%%/images/logos/wifi.gif
+%%WWWDIR%%/images/logos/wifi_modem.png
+%%WWWDIR%%/images/logos/win40.gd2
+%%WWWDIR%%/images/logos/win40.gif
+%%WWWDIR%%/images/logos/win40.jpg
+%%WWWDIR%%/images/logos/win40.png
+%%WWWDIR%%/images/logos/workstation.gd2
+%%WWWDIR%%/images/logos/workstation.gif
+%%WWWDIR%%/images/logos/workstation.png
+%%WWWDIR%%/images/logos/workstation_locked.png
+%%WWWDIR%%/images/logos/yellowdog.gd2
+%%WWWDIR%%/images/logos/yellowdog.gif
+%%WWWDIR%%/images/logos/yellowdog.jpg
+%%WWWDIR%%/images/logos/yellowdog.png
+%%WWWDIR%%/images/logrotate.png
+%%WWWDIR%%/images/menu.png
+%%WWWDIR%%/images/ndisabled.gif
+%%WWWDIR%%/images/noack.gif
+%%WWWDIR%%/images/notes.gif
+%%WWWDIR%%/images/notify.gif
+%%WWWDIR%%/images/orangedot.gif
+%%WWWDIR%%/images/passiveonly.gif
+%%WWWDIR%%/images/recovery.png
+%%WWWDIR%%/images/redudancy.png
+%%WWWDIR%%/images/redundancy.png
+%%WWWDIR%%/images/restart.gif
+%%WWWDIR%%/images/right.gif
+%%WWWDIR%%/images/sblogo.png
+%%WWWDIR%%/images/serviceevent.gif
+%%WWWDIR%%/images/sflogo.png
+%%WWWDIR%%/images/splunk1.gif
+%%WWWDIR%%/images/splunk2.gif
+%%WWWDIR%%/images/start.gif
+%%WWWDIR%%/images/status.gif
+%%WWWDIR%%/images/status2.gif
+%%WWWDIR%%/images/status3.gif
+%%WWWDIR%%/images/status4.gif
+%%WWWDIR%%/images/stop.gif
+%%WWWDIR%%/images/tacdisabled.jpg
+%%WWWDIR%%/images/tacdisabled.png
+%%WWWDIR%%/images/tacenabled.jpg
+%%WWWDIR%%/images/tacenabled.png
+%%WWWDIR%%/images/thermcrit.png
+%%WWWDIR%%/images/thermok.png
+%%WWWDIR%%/images/thermwarn.png
+%%WWWDIR%%/images/trends.gif
+%%WWWDIR%%/images/trendshost.png
+%%WWWDIR%%/images/trendssvc.png
+%%WWWDIR%%/images/unknown.png
+%%WWWDIR%%/images/up.gif
+%%WWWDIR%%/images/warning.png
+%%WWWDIR%%/images/weblogo1.png
+%%WWWDIR%%/images/zoom1.gif
+%%WWWDIR%%/images/zoom2.gif
+%%WWWDIR%%/includes/jquery-1.7.1.min.js
+%%WWWDIR%%/includes/rss/extlib/Snoopy.class.inc
+%%WWWDIR%%/includes/rss/rss_cache.inc
+%%WWWDIR%%/includes/rss/rss_fetch.inc
+%%WWWDIR%%/includes/rss/rss_parse.inc
+%%WWWDIR%%/includes/rss/rss_utils.inc
+%%WWWDIR%%/includes/utils.inc.php
+%%WWWDIR%%/index.php
+%%WWWDIR%%/infobox.html
+%%WWWDIR%%/js/%%NAGIOSUSER%%-decorations.js
+%%WWWDIR%%/js/%%NAGIOSUSER%%-time.js
+%%WWWDIR%%/js/histogram-events.js
+%%WWWDIR%%/js/histogram-form.js
+%%WWWDIR%%/js/histogram-graph.js
+%%WWWDIR%%/js/histogram.js
+%%WWWDIR%%/js/jquery-1.7.1.min.js
+%%WWWDIR%%/js/jsonquery.js
+%%WWWDIR%%/js/map-directive.js
+%%WWWDIR%%/js/map-form.js
+%%WWWDIR%%/js/map.js
+%%WWWDIR%%/js/trends-form.js
+%%WWWDIR%%/js/trends-graph.js
+%%WWWDIR%%/js/trends.js
+%%WWWDIR%%/jsonquery.html
+%%WWWDIR%%/main.php
+%%WWWDIR%%/map-directive.html
+%%WWWDIR%%/map-form.html
+%%WWWDIR%%/map-links.html
+%%WWWDIR%%/map-popup.html
+%%WWWDIR%%/map.html
+%%WWWDIR%%/robots.txt
+%%WWWDIR%%/rss-corebanner.php
+%%WWWDIR%%/rss-corefeed.html
+%%WWWDIR%%/rss-corefeed.php
+%%WWWDIR%%/rss-newsfeed.html
+%%WWWDIR%%/rss-newsfeed.php
+%%WWWDIR%%/side.php
+%%WWWDIR%%/spin/spin.min.js
+%%WWWDIR%%/stylesheets/avail.css
+%%WWWDIR%%/stylesheets/checksanity.css
+%%WWWDIR%%/stylesheets/cmd.css
+%%WWWDIR%%/stylesheets/common.css
+%%WWWDIR%%/stylesheets/config.css
+%%WWWDIR%%/stylesheets/extinfo.css
+%%WWWDIR%%/stylesheets/histogram.css
+%%WWWDIR%%/stylesheets/histogramgraph.css
+%%WWWDIR%%/stylesheets/history.css
+%%WWWDIR%%/stylesheets/jsonquery.css
+%%WWWDIR%%/stylesheets/map-directive.css
+%%WWWDIR%%/stylesheets/map.css
+%%WWWDIR%%/stylesheets/ministatus.css
+%%WWWDIR%%/stylesheets/notifications.css
+%%WWWDIR%%/stylesheets/outages.css
+%%WWWDIR%%/stylesheets/showlog.css
+%%WWWDIR%%/stylesheets/status.css
+%%WWWDIR%%/stylesheets/statusmap.css
+%%WWWDIR%%/stylesheets/summary.css
+%%WWWDIR%%/stylesheets/tac.css
+%%WWWDIR%%/stylesheets/trends.css
+%%WWWDIR%%/stylesheets/trendsgraph.css
+%%WWWDIR%%/trends-form.html
+%%WWWDIR%%/trends-graph.html
+%%WWWDIR%%/trends-host-yaxis.html
+%%WWWDIR%%/trends-links.html
+%%WWWDIR%%/trends-service-yaxis.html
+%%WWWDIR%%/trends.html
+@dir %%WWWDIR%%/ssi
@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives
@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults
@dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw