diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2008-09-03 08:30:56 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2008-09-03 08:30:56 +0800 |
| commit | daf3d0bd6764dc7cf25a32d45945a5836228352b (patch) | |
| tree | b655b042b908ce5c08a6ee6fb22713f61cbb82c7 | |
| parent | 835cee8eb43beab4ce15de757f33a173215a53f1 (diff) | |
| download | freebsd-ports-gnome-daf3d0bd6764dc7cf25a32d45945a5836228352b.tar.gz freebsd-ports-gnome-daf3d0bd6764dc7cf25a32d45945a5836228352b.tar.zst freebsd-ports-gnome-daf3d0bd6764dc7cf25a32d45945a5836228352b.zip | |
- repocopy net-mgmt/nagios -> net-mgmt/nagios2
and connect net-mgmt/nagios2 to the build
- Move net-mgmt/nagios-devel -> net-mgmt/nagios
(v3.0.3)
- Add note to UPDATING
o net-mgmt/nagios [3]
SF Macro
USE_RC_SUBR != yes (rename files/nagios.sh.in -> files/nagios.in)
OPTIONS+= EVENT_BROKER [1]
use @dirrmtry in pkg-plist
o net-mgmt/nagios12 [2]
SF Macro
USE_RC_SUBR != yes (files/nagios.sh.tmpl -> files/nagios.in)
Conversion to pkg-install, pkg-deinstall, pkg-message
use @dirrmtry in pkg-plist
o net-mgmt/nagios2 [4]
SF Macro
USE_RC_SUBR != yes (rename files/nagios.sh.in -> files/nagios.in)
PRs: ports/126758 [4]
ports/126761 [3]
ports/126754 [2]
ports/126684 [1]
Submitted by: Jarrod Sayers <jarrod@netleader.com.au> (maintainer)
Reworked by: pgollucci - freebsd ports infrastructure changes
Reviewed by: pgollucci
Approved by: gabor (mentor)
25 files changed, 354 insertions, 185 deletions
@@ -7,6 +7,34 @@ time you update your ports collection, before attempting any port upgrades. 20080902: + AFFECTS: users of net-mgmt/nagios and net-mgmt/nagios-devel + AUTHOR: Jarrod Sayers <jarrod@netleader.com.au> + + The stable Nagios port has now been updated to version 3.0.3. + Upgrading to this version shouldn't require any configuration + changes, but note that most sample configuration files have + moved into an objects/ directory. + + Nagios 2.12 is still available as net-mgmt/nagios2, use the + following to remain on this legacy stable branch: + + portmaster -o net-mgmt/nagios2 net-mgmt/nagios + + or, if you're using portupgrade: + + portupgrade -o net-mgmt/nagios2 net-mgmt/nagios + + Nagios 3.x development continues in net-mgmt/nagios-devel, + users of this port for production use should consider + switching to the stable branch using: + + portmaster -o net-mgmt/nagios net-mgmt/nagios-devel + + or, if you're using portupgrade: + + portupgrade -o net-mgmt/nagios net-mgmt/nagios-devel + +20080902: AFFECTS: users of math/ploticus AUTHOR: linimon@FreeBSD.org diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 375fbc9dd597..8b630c16ec0f 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -105,6 +105,7 @@ SUBDIR += mtrace SUBDIR += nagcon SUBDIR += nagios + SUBDIR += nagios2 SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula SUBDIR += nagios-check_ports diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 8c0e92255bc8..8ad633d24f9b 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -6,11 +6,9 @@ # PORTNAME= nagios -PORTVERSION= 2.12 -PORTREVISION= 1 +DISTVERSION= 3.0.3 CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= nagios +MASTER_SITES= SF MAINTAINER= jarrod@netleader.com.au COMMENT= Extremely powerful network monitoring system @@ -21,12 +19,13 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio USE_ICONV= yes USE_PERL5_BUILD= yes USE_AUTOTOOLS= autoconf:262 libltdl:15 -USE_RC_SUBR= nagios.sh +USE_RC_SUBR= nagios -CONFLICTS= nagios-[13].* +CONFLICTS= nagios-[12].* nagios-devel-* -OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \ - NANOSLEEP "Use nanosleep in event timing" OFF +OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \ + NANOSLEEP "Use nanosleep in event timing" off \ + EVENT_BROKER "Enable event broker functionality" off GNU_CONFIGURE= yes @@ -41,14 +40,6 @@ NAGIOSWWWDIR?= www/nagios NAGIOSHTMURL?= /nagios NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin -# Suggested NAGIOSHOMEURL values: -# Home: main.html -# Tactical Overview: ${NAGIOSCGIURL}/tac.cgi -# Service Detail: ${NAGIOSCGIURL}/status.cgi?host=all -# Host Detail: ${NAGIOSCGIURL}/status.cgi?hostgroup=all&style=hostdetail -# Status Map: ${NAGIOSCGIURL}/statusmap.cgi?host=all -NAGIOSHOMEURL?= main.html - .include <bsd.port.pre.mk> CPPFLAGS= -I${LOCALBASE}/include -fPIC @@ -65,7 +56,8 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --datadir=${PREFIX}/${NAGIOSWWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ - --prefix=${PREFIX} + --with-httpd-conf=${PREFIX}/etc \ + --with-checkresult-dir=${NAGIOSDIR}/checkresults CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ CFLAGS="${CFLAGS}" \ @@ -89,8 +81,9 @@ SUB_FILES= pkg-install \ pkg-deinstall \ pkg-message +### XXX: Subtle bug with removing PREFIX from here SUB_LIST= PREFIX=${PREFIX} \ - ${PLIST_SUB} + ${PLIST_SUB} .if defined(WITH_EMBEDDED_PERL) USE_PERL5= 5.8.0+ @@ -105,16 +98,18 @@ PLIST_SUB+= EMBEDDED_PERL="@comment " CONFIGURE_ARGS+= --enable-nanosleep .endif -post-patch: - @${REINPLACE_CMD} -e 's#"main.html"#"${NAGIOSHOMEURL:S/\//\\\//g:S/&/\\&/g}"#' \ - ${WRKSRC}/html/index.html.in +.if defined(WITH_EVENT_BROKER) +CONFIGURE_ARGS+= --enable-event-broker +.else +CONFIGURE_ARGS+= --disable-event-broker +.endif pre-install: @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL post-install: - @${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw - @${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives + @${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults ${NAGIOSDIR}/rw + @${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/checkresults @${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw @${CAT} ${PKGMESSAGE} diff --git a/net-mgmt/nagios/distinfo b/net-mgmt/nagios/distinfo index c76073fdf587..70df4276b334 100644 --- a/net-mgmt/nagios/distinfo +++ b/net-mgmt/nagios/distinfo @@ -1,3 +1,3 @@ -MD5 (nagios-2.12.tar.gz) = 2219d90bb5f2282d5ac6d37ef60865b8 -SHA256 (nagios-2.12.tar.gz) = d1bd812793bff2b3bac15ef72ceff788bd6c2ead4952cb1f19c6232fd3c497cd -SIZE (nagios-2.12.tar.gz) = 1742179 +MD5 (nagios-3.0.3.tar.gz) = 151df7bf19b696f7498410fb76fb7caf +SHA256 (nagios-3.0.3.tar.gz) = 65e96d7da182b40d4f9a8c63da1ef861fdfb9502be36a983f8a2e803f711d53c +SIZE (nagios-3.0.3.tar.gz) = 2759396 diff --git a/net-mgmt/nagios/files/nagios.sh.in b/net-mgmt/nagios/files/nagios.in index e1afec9ced54..e1afec9ced54 100644 --- a/net-mgmt/nagios/files/nagios.sh.in +++ b/net-mgmt/nagios/files/nagios.in diff --git a/net-mgmt/nagios/files/patch-Makefile.in b/net-mgmt/nagios/files/patch-Makefile.in index be4f6689afc8..2cff77df03d0 100644 --- a/net-mgmt/nagios/files/patch-Makefile.in +++ b/net-mgmt/nagios/files/patch-Makefile.in @@ -1,30 +1,57 @@ ---- Makefile.in.orig Tue Apr 24 01:14:25 2007 -+++ Makefile.in Thu Nov 1 20:08:40 2007 -@@ -186,7 +186,7 @@ +--- Makefile.in.orig Sun Aug 5 08:43:17 2007 ++++ Makefile.in Thu Aug 30 18:12:04 2007 +@@ -185,12 +185,12 @@ + $(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 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) if [ $(INSTALLPERLSTUFF) = yes ]; then \ - $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ + $(INSTALL) -m 644 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ fi; @echo "" -@@ -213,12 +213,12 @@ +@@ -212,19 +212,18 @@ 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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg -- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.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 "*** Sample config files installed ***" +@@ -254,7 +253,6 @@ + + install-commandmode: + $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw +- chmod g+s $(DESTDIR)$(LOGDIR)/rw @echo "" - @echo "*** Sample config file installed ***" + @echo "*** External command directory configured ***" diff --git a/net-mgmt/nagios/files/patch-base-Makefile.in b/net-mgmt/nagios/files/patch-base-Makefile.in index 2b8138e62835..ad02dffebc60 100644 --- a/net-mgmt/nagios/files/patch-base-Makefile.in +++ b/net-mgmt/nagios/files/patch-base-Makefile.in @@ -1,7 +1,7 @@ ---- base/Makefile.in.orig Wed May 31 02:01:44 2006 -+++ base/Makefile.in Sat Jun 3 11:09:48 2006 -@@ -188,9 +188,9 @@ - $(MAKE) install-basic +--- base/Makefile.in.orig Wed Jan 24 04:58:34 2007 ++++ base/Makefile.in Fri Jul 20 13:34:45 2007 +@@ -193,9 +193,9 @@ + $(MAKE) install-basic install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) diff --git a/net-mgmt/nagios/files/patch-cgi-Makefile.in b/net-mgmt/nagios/files/patch-cgi-Makefile.in index e746d0009c95..13a4564e6917 100644 --- a/net-mgmt/nagios/files/patch-cgi-Makefile.in +++ b/net-mgmt/nagios/files/patch-cgi-Makefile.in @@ -1,7 +1,7 @@ ---- cgi/Makefile.in.orig Wed May 31 02:01:44 2006 -+++ cgi/Makefile.in Sat Jun 3 11:14:04 2006 -@@ -198,9 +198,9 @@ - $(MAKE) install-basic +--- cgi/Makefile.in.orig Wed Dec 13 02:57:57 2006 ++++ cgi/Makefile.in Fri Jul 20 13:35:18 2007 +@@ -190,9 +190,9 @@ + $(MAKE) install-basic install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in index 7a67b5fb6901..58ac6002360c 100644 --- a/net-mgmt/nagios/files/patch-configure.in +++ b/net-mgmt/nagios/files/patch-configure.in @@ -1,14 +1,14 @@ ---- configure.in.orig 2008-03-13 00:31:04.000000000 +1030 -+++ configure.in 2008-03-19 23:58:49.000000000 +1030 +--- configure.in.orig 2007-12-18 04:21:51.000000000 +1030 ++++ configure.in 2008-01-02 12:15:05.000000000 +1030 @@ -6,7 +6,6 @@ AC_INIT(base/nagios.c) - AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h) + AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h) -AC_PREFIX_DEFAULT(/usr/local/nagios) PKG_NAME=nagios - PKG_VERSION="2.11" -@@ -60,7 +59,15 @@ + PKG_VERSION="3.0rc1" +@@ -119,7 +118,15 @@ dnl Test for pthreads support - taken from ICU FreeBSD Port configure script THREADLIBS="" have_pthreads="no" @@ -24,7 +24,7 @@ dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> AC_DEFUN(AC_PTHREAD_FREEBSD,[ -@@ -121,6 +128,7 @@ +@@ -180,6 +187,7 @@ if test $have_pthreads = "no"; then AC_PTHREAD_FREEBSD fi @@ -32,7 +32,7 @@ AC_SUBST(THREADLIBS) -@@ -137,7 +145,7 @@ +@@ -196,7 +204,7 @@ AC_SUBST(nagios_grp) AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user") AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp") @@ -41,16 +41,19 @@ AC_SUBST(INSTALL_OPTS) AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user) -@@ -170,7 +178,7 @@ - AC_PATH_PROG(MAIL_PROG,mail) - fi - dnl Fix for systems that don't (yet) have mail/mailx installed... --if test x$MAIL_PROG=x; then -+if test x$MAIL_PROG = x; then - MAIL_PROG="/bin/mail" +@@ -520,9 +528,9 @@ fi - AC_SUBST(MAIL_PROG) -@@ -599,6 +607,9 @@ + + dnl Try and locate glib +-GLIB_INCLUDE=`pkg-config --cflags glib-2.0` ++GLIB_INCLUDE="" + AC_SUBST(GLIB_INCLUDE) +-GLIB_LIBS=`pkg-config --libs glib-2.0` ++GLIB_LIBS="" + AC_SUBST(GLIB_LIBS) + if test x$GLIB_LIBS != x; then + AC_DEFINE_UNQUOTED(HAVE_GLIB) +@@ -667,6 +675,9 @@ AC_DEFINE_UNQUOTED(EMBEDDEDPERL) PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" diff --git a/net-mgmt/nagios/files/patch-html-Makefile.in b/net-mgmt/nagios/files/patch-html-Makefile.in index a34e47dc2970..0a5dc643d707 100644 --- a/net-mgmt/nagios/files/patch-html-Makefile.in +++ b/net-mgmt/nagios/files/patch-html-Makefile.in @@ -1,6 +1,6 @@ ---- html/Makefile.in.orig Thu Apr 10 05:46:02 2003 -+++ html/Makefile.in Sat Feb 12 13:53:16 2005 -@@ -33,37 +33,37 @@ +--- html/Makefile.in.orig 2008-01-10 04:21:25.000000000 +1030 ++++ html/Makefile.in 2008-01-30 23:02:38.000000000 +1030 +@@ -33,39 +33,39 @@ devclean: distclean install: @@ -53,9 +53,12 @@ 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 - - + install-unstripped: + $(MAKE) install diff --git a/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html b/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html deleted file mode 100644 index 156de7c7a396..000000000000 --- a/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html +++ /dev/null @@ -1,24 +0,0 @@ ---- html/docs/xodtemplate.html.orig Wed Dec 27 05:03:22 2006 -+++ html/docs/xodtemplate.html Sat Jan 27 18:56:48 2007 -@@ -493,9 +493,9 @@ - <p class="SectionBody"> - <pre> - define service{ -- host_name linux-server -- service_description check-disk-sda1 -- check_command check-disk!/dev/sda1 -+ host_name freebsd-server -+ service_description check-disk-ad0s1a -+ check_command check-disk!/dev/ad0s1a - max_check_attempts 5 - normal_check_interval 5 - retry_check_interval 3 -@@ -503,7 +503,7 @@ - notification_interval 30 - notification_period 24x7 - notification_options w,c,r -- contact_groups linux-admins -+ contact_groups freebsd-admins - } - </pre> - </p> diff --git a/net-mgmt/nagios/files/patch-include-locations.h.in b/net-mgmt/nagios/files/patch-include-locations.h.in new file mode 100644 index 000000000000..a8bffb11bcc0 --- /dev/null +++ b/net-mgmt/nagios/files/patch-include-locations.h.in @@ -0,0 +1,11 @@ +--- include/locations.h.in.orig Tue May 1 08:15:57 2007 ++++ include/locations.h.in Fri Jul 20 15:52:49 2007 +@@ -20,7 +20,7 @@ + + #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" + #define DEFAULT_TEMP_PATH "/tmp" +-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults" ++#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults" + #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat" + #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log" + #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" diff --git a/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in b/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in new file mode 100644 index 000000000000..0637cf6a8bba --- /dev/null +++ b/net-mgmt/nagios/files/patch-sample-config-nagios.cfg.in @@ -0,0 +1,11 @@ +--- sample-config/nagios.cfg.in.orig Tue Jun 19 02:26:33 2007 ++++ sample-config/nagios.cfg.in Fri Jul 20 13:45:09 2007 +@@ -32,7 +32,7 @@ + cfg_file=@sysconfdir@/objects/timeperiods.cfg + cfg_file=@sysconfdir@/objects/templates.cfg + +-# Definitions for monitoring the local (Linux) host ++# Definitions for monitoring the local (FreeBSD) host + cfg_file=@sysconfdir@/objects/localhost.cfg + + # Definitions for monitoring a Windows machine diff --git a/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in b/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in index ff3f25aac049..3a9a5b6cab7c 100644 --- a/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in +++ b/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in @@ -1,36 +1,40 @@ ---- sample-config/template-object/localhost.cfg.in.orig Tue Nov 28 12:59:05 2006 -+++ sample-config/template-object/localhost.cfg.in Sat Jan 27 19:01:52 2007 -@@ -151,15 +151,15 @@ - } - +--- sample-config/template-object/localhost.cfg.in.orig Sun Jun 10 02:13:05 2007 ++++ sample-config/template-object/localhost.cfg.in Fri Jul 20 13:46:46 2007 +@@ -5,7 +5,7 @@ + # + # NOTE: This config file is intended to serve as an *extremely* simple + # example of how you can create configuration entries to monitor +-# the local (Linux) machine. ++# the local (FreeBSD) machine. + # + ############################################################################### --# Linux host definition template - This is NOT a real host, just a template! -+# FreeBSD host definition template - This is NOT a real host, just a template! - - define host{ -- name linux-server ; The name of this host template -+ name freebsd-server ; The name of this host template - use generic-host ; This template inherits other values from the generic-host template -- check_period 24x7 ; By default, Linux hosts are checked round the clock -- max_check_attempts 10 ; Check each Linux host 10 times (max) -- check_command check-host-alive ; Default command to check Linux hosts -- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day -+ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock -+ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) -+ check_command check-host-alive ; Default command to check FreeBSD hosts -+ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day - ; Note that the notification_period variable is being overridden from - ; the value that is inherited from the generic-host template! - notification_interval 120 ; Resend notification every 2 hours -@@ -173,9 +173,9 @@ - # local host (this machine). +@@ -23,9 +23,9 @@ + # Define a host for the local machine define host{ - use linux-server ; Name of host template to use -+ use freebsd-server ; Name of host template to use ++ use freebsd-server ; Name of host template to use ; This host definition will inherit all variables that are defined - ; in (or inherited by) the linux-server host template definition. + ; in (or inherited by) the freebsd-server host template definition. host_name localhost alias localhost address 127.0.0.1 +@@ -41,12 +41,12 @@ + ############################################################################### + ############################################################################### + +-# Define an optional hostgroup for Linux machines ++# Define an optional hostgroup for FreeBSD machines + + define hostgroup{ +- hostgroup_name linux-servers ; The name of the hostgroup +- alias Linux Servers ; Long name of the group +- members localhost ; Comma separated list of hosts that belong to this group ++ hostgroup_name freebsd-servers ; The name of the hostgroup ++ alias FreeBSD Servers ; Long name of the group ++ members localhost ; Comma separated list of hosts that belong to this group + } + + diff --git a/net-mgmt/nagios/files/patch-sample-config-template-object-templates.cfg.in b/net-mgmt/nagios/files/patch-sample-config-template-object-templates.cfg.in new file mode 100644 index 000000000000..280be54aed9b --- /dev/null +++ b/net-mgmt/nagios/files/patch-sample-config-template-object-templates.cfg.in @@ -0,0 +1,26 @@ +--- sample-config/template-object/templates.cfg.in.orig Fri Jul 20 13:46:57 2007 ++++ sample-config/template-object/templates.cfg.in Fri Jul 20 13:47:52 2007 +@@ -63,17 +63,17 @@ + } + + +-# Linux host definition template - This is NOT a real host, just a template! ++# FreeBSD host definition template - This is NOT a real host, just a template! + + define host{ +- name linux-server ; The name of this host template ++ name freebsd-server ; The name of this host template + use generic-host ; This template inherits other values from the generic-host template +- check_period 24x7 ; By default, Linux hosts are checked round the clock ++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock + check_interval 5 ; Actively check the host every 5 minutes + retry_interval 1 ; Schedule host check retries at 1 minute intervals +- max_check_attempts 10 ; Check each Linux host 10 times (max) +- check_command check-host-alive ; Default command to check Linux hosts +- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day ++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) ++ check_command check-host-alive ; Default command to check FreeBSD hosts ++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day + ; Note that the notification_period variable is being overridden from + ; the value that is inherited from the generic-host template! + notification_interval 120 ; Resend notifications every 2 hours diff --git a/net-mgmt/nagios/pkg-descr b/net-mgmt/nagios/pkg-descr index b1ff9995e7fc..656a529f8828 100644 --- a/net-mgmt/nagios/pkg-descr +++ b/net-mgmt/nagios/pkg-descr @@ -1,12 +1,10 @@ Nagios is a host and service monitor designed to inform you of network -problems before your clients, end-users or managers do. It has been -designed to run under the Linux operating system, but works fine under -most *NIX variants as well. The monitoring daemon runs intermittent -checks on hosts and services you specify using external "plugins" -which return status information to Nagios. When problems are -encountered, the daemon can send notifications out to administrative -contacts in a variety of different ways (email, instant message, SMS, -etc.). Current status information, historical logs, and reports can -all be accessed via a web browser. +problems before your clients, end-users or managers do. The monitoring +daemon runs intermittent checks on hosts and services you specify +using external "plugins" which return status information to Nagios. +When problems are encountered, the daemon can send notifications out +to administrative contacts in a variety of different ways (email, +instant message, SMS, etc.). Current status information, historical +logs, and reports can all be accessed via a web browser. WWW: http://www.nagios.org/ diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index f889005af8ad..fec61479a765 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -1,16 +1,22 @@ @exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi @exec mkdir -p %%NAGIOSDIR%%/archives +@exec mkdir -p %%NAGIOSDIR%%/checkresults @exec mkdir -p %%NAGIOSDIR%%/rw -@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/rw -@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives +@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults %%NAGIOSDIR%%/rw +@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults @exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw bin/nagios bin/nagiostats %%EMBEDDED_PERL%%bin/p1.pl etc/nagios/cgi.cfg-sample -etc/nagios/commands.cfg-sample -etc/nagios/localhost.cfg-sample etc/nagios/nagios.cfg-sample +etc/nagios/objects/commands.cfg-sample +etc/nagios/objects/contacts.cfg-sample +etc/nagios/objects/localhost.cfg-sample +etc/nagios/objects/printer.cfg-sample +etc/nagios/objects/switch.cfg-sample +etc/nagios/objects/templates.cfg-sample +etc/nagios/objects/timeperiods.cfg-sample etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi %%NAGIOSWWWDIR%%/cgi-bin/cmd.cgi @@ -92,31 +98,39 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/contexthelp/N6.html %%NAGIOSWWWDIR%%/contexthelp/N7.html %%NAGIOSWWWDIR%%/docs/about.html +%%NAGIOSWWWDIR%%/docs/activechecks.html %%NAGIOSWWWDIR%%/docs/adaptive.html %%NAGIOSWWWDIR%%/docs/addons.html %%NAGIOSWWWDIR%%/docs/beginners.html +%%NAGIOSWWWDIR%%/docs/cachedchecks.html %%NAGIOSWWWDIR%%/docs/cgiauth.html %%NAGIOSWWWDIR%%/docs/cgiincludes.html %%NAGIOSWWWDIR%%/docs/cgis.html %%NAGIOSWWWDIR%%/docs/checkscheduling.html %%NAGIOSWWWDIR%%/docs/clusters.html -%%NAGIOSWWWDIR%%/docs/commandfile.html %%NAGIOSWWWDIR%%/docs/config.html %%NAGIOSWWWDIR%%/docs/configcgi.html -%%NAGIOSWWWDIR%%/docs/configextinfo.html %%NAGIOSWWWDIR%%/docs/configmain.html %%NAGIOSWWWDIR%%/docs/configobject.html +%%NAGIOSWWWDIR%%/docs/customobjectvars.html %%NAGIOSWWWDIR%%/docs/dependencies.html +%%NAGIOSWWWDIR%%/docs/dependencychecks.html %%NAGIOSWWWDIR%%/docs/distributed.html %%NAGIOSWWWDIR%%/docs/downtime.html %%NAGIOSWWWDIR%%/docs/embeddedperl.html +%%NAGIOSWWWDIR%%/docs/epnplugins.html %%NAGIOSWWWDIR%%/docs/escalations.html %%NAGIOSWWWDIR%%/docs/eventhandlers.html %%NAGIOSWWWDIR%%/docs/extcommands.html +%%NAGIOSWWWDIR%%/docs/faststartup.html %%NAGIOSWWWDIR%%/docs/flapping.html %%NAGIOSWWWDIR%%/docs/freshness.html %%NAGIOSWWWDIR%%/docs/funstuff.html -%%NAGIOSWWWDIR%%/docs/images/activepassive.png +%%NAGIOSWWWDIR%%/docs/hostchecks.html +%%NAGIOSWWWDIR%%/docs/images/activechecks.png +%%NAGIOSWWWDIR%%/docs/images/cachedcheckgraphs.png +%%NAGIOSWWWDIR%%/docs/images/cachedchecks.png +%%NAGIOSWWWDIR%%/docs/images/cachedchecks1.png %%NAGIOSWWWDIR%%/docs/images/cgi-avail-a.png %%NAGIOSWWWDIR%%/docs/images/cgi-avail-b.png %%NAGIOSWWWDIR%%/docs/images/cgi-cmd.png @@ -140,61 +154,127 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/docs/images/cgi-summary.png %%NAGIOSWWWDIR%%/docs/images/cgi-tac.png %%NAGIOSWWWDIR%%/docs/images/cgi-trends.png +%%NAGIOSWWWDIR%%/docs/images/checkmark.png %%NAGIOSWWWDIR%%/docs/images/checktiming.png +%%NAGIOSWWWDIR%%/docs/images/configoverview.png %%NAGIOSWWWDIR%%/docs/images/distributed.png +%%NAGIOSWWWDIR%%/docs/images/downtime.png +%%NAGIOSWWWDIR%%/docs/images/epn.png +%%NAGIOSWWWDIR%%/docs/images/eventhandlers.png +%%NAGIOSWWWDIR%%/docs/images/externalcommands.png +%%NAGIOSWWWDIR%%/docs/images/fast-startup.png +%%NAGIOSWWWDIR%%/docs/images/fast-startup1.png +%%NAGIOSWWWDIR%%/docs/images/fast-startup2.png +%%NAGIOSWWWDIR%%/docs/images/freshness.png %%NAGIOSWWWDIR%%/docs/images/host-dependencies.png -%%NAGIOSWWWDIR%%/docs/images/indirecthostcheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck.png -%%NAGIOSWWWDIR%%/docs/images/indirectsvccheck2.png +%%NAGIOSWWWDIR%%/docs/images/important.gif +%%NAGIOSWWWDIR%%/docs/images/integrationoverview.png %%NAGIOSWWWDIR%%/docs/images/interleaved1.png %%NAGIOSWWWDIR%%/docs/images/interleaved2.png %%NAGIOSWWWDIR%%/docs/images/interleaved3.png %%NAGIOSWWWDIR%%/docs/images/logofullsize.png -%%NAGIOSWWWDIR%%/docs/images/mrtgstats.png -%%NAGIOSWWWDIR%%/docs/images/network-heirarchy.png +%%NAGIOSWWWDIR%%/docs/images/monitoring-printers.png +%%NAGIOSWWWDIR%%/docs/images/monitoring-routers.png +%%NAGIOSWWWDIR%%/docs/images/monitoring-windows.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-activehostchecks.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-activelychecked.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-activeservicechecks.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-cachedchecks.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-commandbuffers.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-externalcommands.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-hostperfstats.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-hoststatechange.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-passivechecks.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-passivelychecked.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-serviceperfstats.png +%%NAGIOSWWWDIR%%/docs/images/mrtg-servicestatechange.png +%%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png +%%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png +%%NAGIOSWWWDIR%%/docs/images/nagios.jpg +%%NAGIOSWWWDIR%%/docs/images/ndoutils.png %%NAGIOSWWWDIR%%/docs/images/network-outage1.png %%NAGIOSWWWDIR%%/docs/images/network-outage2.png %%NAGIOSWWWDIR%%/docs/images/noninterleaved1.png %%NAGIOSWWWDIR%%/docs/images/noninterleaved2.png -%%NAGIOSWWWDIR%%/docs/images/physical-network.png -%%NAGIOSWWWDIR%%/docs/images/plugintheory.png +%%NAGIOSWWWDIR%%/docs/images/note.gif +%%NAGIOSWWWDIR%%/docs/images/nrpe.png +%%NAGIOSWWWDIR%%/docs/images/nsca.png +%%NAGIOSWWWDIR%%/docs/images/nscpp.png +%%NAGIOSWWWDIR%%/docs/images/objects-commands.png +%%NAGIOSWWWDIR%%/docs/images/objects-contacts.png +%%NAGIOSWWWDIR%%/docs/images/objects-hosts.png +%%NAGIOSWWWDIR%%/docs/images/objects-services.png +%%NAGIOSWWWDIR%%/docs/images/objects-timeperiods.png +%%NAGIOSWWWDIR%%/docs/images/passivechecks.png +%%NAGIOSWWWDIR%%/docs/images/passivehosttranslation.png +%%NAGIOSWWWDIR%%/docs/images/plugins.png +%%NAGIOSWWWDIR%%/docs/images/predictive-dependency-checks.png +%%NAGIOSWWWDIR%%/docs/images/printer.png +%%NAGIOSWWWDIR%%/docs/images/reachability1.png +%%NAGIOSWWWDIR%%/docs/images/reachability2.png +%%NAGIOSWWWDIR%%/docs/images/reachability3.png +%%NAGIOSWWWDIR%%/docs/images/reachability4.png %%NAGIOSWWWDIR%%/docs/images/redudancy.png %%NAGIOSWWWDIR%%/docs/images/redundancy.png +%%NAGIOSWWWDIR%%/docs/images/security.png +%%NAGIOSWWWDIR%%/docs/images/security1.png +%%NAGIOSWWWDIR%%/docs/images/security2.png +%%NAGIOSWWWDIR%%/docs/images/security3.png +%%NAGIOSWWWDIR%%/docs/images/seealso.gif %%NAGIOSWWWDIR%%/docs/images/service-dependencies.png %%NAGIOSWWWDIR%%/docs/images/statetransitions.png %%NAGIOSWWWDIR%%/docs/images/statetransitions2.png +%%NAGIOSWWWDIR%%/docs/images/stoprestart.png +%%NAGIOSWWWDIR%%/docs/images/switch.png +%%NAGIOSWWWDIR%%/docs/images/tcpwrappers.png +%%NAGIOSWWWDIR%%/docs/images/tip.gif +%%NAGIOSWWWDIR%%/docs/images/tuning.png +%%NAGIOSWWWDIR%%/docs/images/upto.gif %%NAGIOSWWWDIR%%/docs/index.html -%%NAGIOSWWWDIR%%/docs/indirectchecks.html -%%NAGIOSWWWDIR%%/docs/installing.html -%%NAGIOSWWWDIR%%/docs/installweb.html %%NAGIOSWWWDIR%%/docs/int-snmptrap.html %%NAGIOSWWWDIR%%/docs/int-tcpwrappers.html +%%NAGIOSWWWDIR%%/docs/integration.html +%%NAGIOSWWWDIR%%/docs/largeinstalltweaks.html +%%NAGIOSWWWDIR%%/docs/macrolist.html %%NAGIOSWWWDIR%%/docs/macros.html +%%NAGIOSWWWDIR%%/docs/monitoring-linux.html +%%NAGIOSWWWDIR%%/docs/monitoring-netware.html +%%NAGIOSWWWDIR%%/docs/monitoring-printers.html +%%NAGIOSWWWDIR%%/docs/monitoring-publicservices.html +%%NAGIOSWWWDIR%%/docs/monitoring-routers.html +%%NAGIOSWWWDIR%%/docs/monitoring-windows.html +%%NAGIOSWWWDIR%%/docs/mrtggraphs.html %%NAGIOSWWWDIR%%/docs/nagiostats.html -%%NAGIOSWWWDIR%%/docs/networkoutages.html %%NAGIOSWWWDIR%%/docs/networkreachability.html %%NAGIOSWWWDIR%%/docs/notifications.html -%%NAGIOSWWWDIR%%/docs/parallelization.html +%%NAGIOSWWWDIR%%/docs/objectdefinitions.html +%%NAGIOSWWWDIR%%/docs/objectinheritance.html +%%NAGIOSWWWDIR%%/docs/objecttricks.html +%%NAGIOSWWWDIR%%/docs/oncallrotation.html %%NAGIOSWWWDIR%%/docs/passivechecks.html +%%NAGIOSWWWDIR%%/docs/passivestatetranslation.html %%NAGIOSWWWDIR%%/docs/perfdata.html +%%NAGIOSWWWDIR%%/docs/pluginapi.html %%NAGIOSWWWDIR%%/docs/plugins.html -%%NAGIOSWWWDIR%%/docs/plugintheory.html +%%NAGIOSWWWDIR%%/docs/quickstart-fedora.html +%%NAGIOSWWWDIR%%/docs/quickstart-opensuse.html +%%NAGIOSWWWDIR%%/docs/quickstart-ubuntu.html +%%NAGIOSWWWDIR%%/docs/quickstart.html %%NAGIOSWWWDIR%%/docs/redundancy.html %%NAGIOSWWWDIR%%/docs/robots.txt %%NAGIOSWWWDIR%%/docs/security.html +%%NAGIOSWWWDIR%%/docs/servicechecks.html %%NAGIOSWWWDIR%%/docs/stalking.html -%%NAGIOSWWWDIR%%/docs/starting.html +%%NAGIOSWWWDIR%%/docs/startstop.html %%NAGIOSWWWDIR%%/docs/statetypes.html -%%NAGIOSWWWDIR%%/docs/stoprestart.html -%%NAGIOSWWWDIR%%/docs/templaterecursion.html -%%NAGIOSWWWDIR%%/docs/templatetricks.html %%NAGIOSWWWDIR%%/docs/timeperiods.html %%NAGIOSWWWDIR%%/docs/toc.html %%NAGIOSWWWDIR%%/docs/tuning.html +%%NAGIOSWWWDIR%%/docs/upgrading.html %%NAGIOSWWWDIR%%/docs/verifyconfig.html %%NAGIOSWWWDIR%%/docs/volatileservices.html %%NAGIOSWWWDIR%%/docs/whatsnew.html -%%NAGIOSWWWDIR%%/docs/xodtemplate.html +%%NAGIOSWWWDIR%%/images/NagiosEnterprises-whitebg-112x46.png %%NAGIOSWWWDIR%%/images/ack.gif %%NAGIOSWWWDIR%%/images/action.gif %%NAGIOSWWWDIR%%/images/command.png @@ -211,14 +291,16 @@ etc/nagios/resource.cfg-sample %%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/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.jpg +%%NAGIOSWWWDIR%%/images/logofullsize.png %%NAGIOSWWWDIR%%/images/logos/nagios.gd2 %%NAGIOSWWWDIR%%/images/logos/nagios.gif %%NAGIOSWWWDIR%%/images/logos/nagiosvrml.png @@ -238,6 +320,8 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/images/right.gif %%NAGIOSWWWDIR%%/images/sblogo.jpg %%NAGIOSWWWDIR%%/images/serviceevent.gif +%%NAGIOSWWWDIR%%/images/splunk1.gif +%%NAGIOSWWWDIR%%/images/splunk2.gif %%NAGIOSWWWDIR%%/images/start.gif %%NAGIOSWWWDIR%%/images/status.gif %%NAGIOSWWWDIR%%/images/status2.gif @@ -284,6 +368,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css +@dirrmtry etc/nagios/objects @dirrmtry etc/nagios @dirrm %%NAGIOSWWWDIR%%/cgi-bin @dirrm %%NAGIOSWWWDIR%%/contexthelp @@ -295,6 +380,7 @@ etc/nagios/resource.cfg-sample @dirrm %%NAGIOSWWWDIR%%/ssi @dirrm %%NAGIOSWWWDIR%%/stylesheets @dirrmtry %%NAGIOSWWWDIR%% -@unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true -@unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true +@dirrmtry %%NAGIOSDIR%%/archives +@dirrmtry %%NAGIOSDIR%%/checkresults +@dirrmtry %%NAGIOSDIR%%/rw +@dirrmtry %%NAGIOSDIR%% diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile index cdb042f4a8de..fbeff14caf06 100644 --- a/net-mgmt/nagios12/Makefile +++ b/net-mgmt/nagios12/Makefile @@ -7,26 +7,21 @@ PORTNAME= nagios PORTVERSION= 1.2 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=nagios +MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jarrod@netleader.com.au COMMENT= Extremely powerful network monitoring system LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins GNU_CONFIGURE= yes -USE_RC_SUBR= yes +USE_RC_SUBR= nagios USE_PERL5_BUILD=yes -PKGINSTALL= ${WRKDIR}/INSTALL -PKGDEINSTALL= ${WRKDIR}/DEINSTALL -PKGMESSAGE= ${WRKDIR}/MESSAGE - NAGIOSUSER?= nagios NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios @@ -35,7 +30,7 @@ OPTIONS= MYSQL "MySQL suport" off \ PGSQL "PostgreSQL suport" off \ FILE_PERFDATA "Save performance data to files" off -CONFLICTS= nagios-2* +CONFLICTS= nagios-[23].* nagios-devel-* LATEST_LINK= nagios12 .include <bsd.port.pre.mk> @@ -77,24 +72,30 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-xdata .endif -SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \ - -e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \ - -e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' +PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ + NAGIOSWWWDIR=${NAGIOSWWWDIR} \ + NAGIOSUSER=${NAGIOSUSER} \ + NAGIOSGROUP=${NAGIOSGROUP} \ + NAGIOSUID=${NAGIOSUID} \ + NAGIOSGID=${NAGIOSGID} \ + NAGIOSHTMURL=${NAGIOSHTMURL} \ + NAGIOSCGIURL=${NAGIOSCGIURL} \ + WWWGRP=${WWWGRP} -INSTALL_TARGET= all install config install-config install-commandmode +SUB_FILES= pkg-install \ + pkg-deinstall \ + pkg-message -pre-build: - for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \ - ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \ - done +### XXX: Subtle bug with removing PREFIX from here +SUB_LIST= PREFIX=${PREFIX} \ + ${PLIST_SUB} + +INSTALL_TARGET= all install config install-config install-commandmode pre-install: @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/ @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/net-mgmt/nagios12/files/nagios.sh.tmpl b/net-mgmt/nagios12/files/nagios.in index d3cd0691f819..fd71477562ff 100644 --- a/net-mgmt/nagios12/files/nagios.sh.tmpl +++ b/net-mgmt/nagios12/files/nagios.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/nagios.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $ # # diff --git a/net-mgmt/nagios12/files/DEINSTALL.tmpl b/net-mgmt/nagios12/files/pkg-deinstall.in index 93ed52b4d017..fad8fb86716e 100644 --- a/net-mgmt/nagios12/files/DEINSTALL.tmpl +++ b/net-mgmt/nagios12/files/pkg-deinstall.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/pkg-deinstall.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $ # USER=%%NAGIOSUSER%% diff --git a/net-mgmt/nagios12/files/INSTALL.tmpl b/net-mgmt/nagios12/files/pkg-install.in index 64e6882bdee2..829919b1a9b5 100644 --- a/net-mgmt/nagios12/files/INSTALL.tmpl +++ b/net-mgmt/nagios12/files/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/pkg-install.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $ # USER=%%NAGIOSUSER%% diff --git a/net-mgmt/nagios12/files/MESSAGE.tmpl b/net-mgmt/nagios12/files/pkg-message.in index a96b0d6243c3..a96b0d6243c3 100644 --- a/net-mgmt/nagios12/files/MESSAGE.tmpl +++ b/net-mgmt/nagios12/files/pkg-message.in diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist index 9ac1293101f0..9284d8385ab7 100644 --- a/net-mgmt/nagios12/pkg-plist +++ b/net-mgmt/nagios12/pkg-plist @@ -20,7 +20,6 @@ etc/nagios/resource.cfg-sample etc/nagios/serviceextinfo.cfg-sample etc/nagios/services.cfg-sample etc/nagios/timeperiods.cfg-sample -etc/rc.d/nagios.sh share/nagios/cgi-bin/avail.cgi share/nagios/cgi-bin/cmd.cgi share/nagios/cgi-bin/config.cgi @@ -309,6 +308,6 @@ share/nagios/stylesheets/trends.css @dirrm share/nagios/ssi @dirrm share/nagios/stylesheets @dirrm share/nagios -@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true -@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true -@unexec rmdir /var/spool/nagios 2>/dev/null || true +@dirrmtry /var/spool/nagios/archives +@dirrmtry /var/spool/nagios/rw +@dirrmtry /var/spool/nagios diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 8c0e92255bc8..589c10bab451 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -9,8 +9,7 @@ PORTNAME= nagios PORTVERSION= 2.12 PORTREVISION= 1 CATEGORIES= net-mgmt -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= nagios +MASTER_SITES= SF MAINTAINER= jarrod@netleader.com.au COMMENT= Extremely powerful network monitoring system @@ -21,9 +20,9 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio USE_ICONV= yes USE_PERL5_BUILD= yes USE_AUTOTOOLS= autoconf:262 libltdl:15 -USE_RC_SUBR= nagios.sh +USE_RC_SUBR= nagios -CONFLICTS= nagios-[13].* +CONFLICTS= nagios-[13].* nagios-devel-* OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \ NANOSLEEP "Use nanosleep in event timing" OFF @@ -89,6 +88,7 @@ SUB_FILES= pkg-install \ pkg-deinstall \ pkg-message +### XXX: Subtle bug with removing PREFIX from here SUB_LIST= PREFIX=${PREFIX} \ ${PLIST_SUB} diff --git a/net-mgmt/nagios2/files/nagios.sh.in b/net-mgmt/nagios2/files/nagios.in index e1afec9ced54..05939dd03523 100644 --- a/net-mgmt/nagios2/files/nagios.sh.in +++ b/net-mgmt/nagios2/files/nagios.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios2/files/Attic/nagios.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $ # # PROVIDE: nagios |