update to nagios 2.7

many bugfixes

ok bernd
This commit is contained in:
sturm 2007-02-13 21:59:13 +00:00
parent b84d30e28c
commit e2c8d7dc4a
4 changed files with 25 additions and 30 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2006/11/26 01:01:32 espie Exp $
# $OpenBSD: Makefile,v 1.21 2007/02/13 21:59:13 sturm Exp $
COMMENT-main= "host and service monitor"
COMMENT-web= "cgis and webpages for nagios"
V= 2.5
V= 2.7
DISTNAME= nagios-${V}
PKGNAME-main= nagios-${V}p0
PKGNAME-main= nagios-${V}
PKGNAME-web= nagios-web-${V}
CATEGORIES= net
@ -72,7 +72,7 @@ WANTLIB-main= ${WANTLIB} pthread
NO_REGRESS= Yes
CONFIG_FILES0= cgi.cfg httpd.conf nagios.cfg resource.cfg
CONFIG_FILES1= bigger.cfg checkcommands.cfg minimal.cfg misccommands.cfg
CONFIG_FILES1= commands.cfg localhost.cfg
EXDIR= ${PREFIX}/share/examples/nagios
SUBST_VARS= CHROOT

View File

@ -1,4 +1,5 @@
MD5 (nagios-2.5.tar.gz) = 1a77528f6797bd3c0320da5e4fae2b1a
RMD160 (nagios-2.5.tar.gz) = a0f1890ed546ce026cf784ae3ca83119275bd529
SHA1 (nagios-2.5.tar.gz) = 00e6bc45c5634649b6a1be2758ec181197d38f76
SIZE (nagios-2.5.tar.gz) = 1736167
MD5 (nagios-2.7.tar.gz) = d664d2785cdca3c5c8a3e84c033e8e6e
RMD160 (nagios-2.7.tar.gz) = 6412149c37cd82d731b807f3e43fd5afbe528f14
SHA1 (nagios-2.7.tar.gz) = ce723d8324f76b9a8b6cd18e04d62c1d47013b04
SHA256 (nagios-2.7.tar.gz) = defb4062f077f999d1da2bcfcb87786c5d7fbca7d1346c7e6a19084b5629b2c1
SIZE (nagios-2.7.tar.gz) = 1737308

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sample-config_nagios_cfg_in,v 1.1.1.1 2005/07/25 16:32:06 sturm Exp $
--- sample-config/nagios.cfg.in.orig Tue Apr 5 21:46:18 2005
+++ sample-config/nagios.cfg.in Tue Apr 5 21:54:15 2005
$OpenBSD: patch-sample-config_nagios_cfg_in,v 1.2 2007/02/13 21:59:13 sturm Exp $
--- sample-config/nagios.cfg.in.orig Fri Dec 22 02:43:20 2006
+++ sample-config/nagios.cfg.in Fri Feb 2 09:43:50 2007
@@ -16,7 +16,7 @@
# for historical purposes. This should be the first option specified
# in the config file!!!
@ -10,20 +10,16 @@ $OpenBSD: patch-sample-config_nagios_cfg_in,v 1.1.1.1 2005/07/25 16:32:06 sturm
@@ -34,10 +34,10 @@ log_file=@localstatedir@/nagios.log
# Arguments are likely to change between different releases of the
# plugins, so you should use the same config file provided with the
# plugin release rather than the one provided with Nagios.
-cfg_file=@sysconfdir@/checkcommands.cfg
+#cfg_file=@sysconfdir@/checkcommands.cfg
@@ -31,7 +31,7 @@ log_file=@localstatedir@/nagios.log
# separate from host and contact definitions...
# Misc commands (notification and event handler commands, etc)
-cfg_file=@sysconfdir@/misccommands.cfg
+#cfg_file=@sysconfdir@/misccommands.cfg
# Command definitions
-cfg_file=@sysconfdir@/commands.cfg
+#cfg_file=@sysconfdir@/commands.cfg
# You can split other types of object definitions across several
# config files if you wish (as done here), or keep them all in a
@@ -240,7 +240,7 @@ log_rotation_method=d
# Host and service definitions for monitoring this machine
cfg_file=@sysconfdir@/localhost.cfg
@@ -245,7 +245,7 @@ log_rotation_method=d
# This is the directory where archived (rotated) log files should be
# placed (assuming you've chosen to do log rotation).

View File

@ -1,19 +1,17 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 01:01:32 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/02/13 21:59:13 sturm Exp $
@pkgpath ${BASE_PKGPATH}
@newgroup _nagios:550
@newuser _nagios:550:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
@pkgpath ${BASE_PKGPATH}
bin/nagiostats
sbin/nagios
share/examples/nagios/
share/examples/nagios/bigger.cfg
share/examples/nagios/cgi.cfg
@sample ${CHROOT}${SYSCONFDIR}/nagios/
@sample ${CHROOT}${SYSCONFDIR}/nagios/cgi.cfg
share/examples/nagios/checkcommands.cfg
share/examples/nagios/commands.cfg
share/examples/nagios/httpd.conf
share/examples/nagios/minimal.cfg
@sample ${CHROOT}${SYSCONFDIR}/nagios/minimal.cfg
share/examples/nagios/misccommands.cfg
share/examples/nagios/localhost.cfg
@sample ${CHROOT}${SYSCONFDIR}/nagios/localhost.cfg
share/examples/nagios/nagios.cfg
@sample ${CHROOT}${SYSCONFDIR}/nagios/nagios.cfg
share/examples/nagios/resource.cfg