MAINTAINER UPDATE: net/nagios

- move nagios workfile directory from /usr/local/var/nagios
	  to /var/spool/nagios. /usr/local is read-only on some NFS
	  booted systems.
	- remove scripts/checkps, everybody should have a working
	  /bin/ps by now.
	- add new switches WITH_MYSQL and WITH_PGSQL which enable
	  support for putting configuration files into a MySQL or
	  PostgreSQL database, based on a patch submitted in PR
	  48102 by Krzysztof Stryjek <wtp@mud.pl>

PR:		ports/48988
Submitted by:	Blaz Zupan <blaz@si.FreeBSD.org>
This commit is contained in:
Edwin Groothuis 2003-04-07 01:16:37 +00:00
parent 84746f17e8
commit 74feb01ba0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=78478
32 changed files with 264 additions and 104 deletions

View file

@ -7,10 +7,10 @@
PORTNAME= nagios
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-1.0
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${PREFIX}/var/nagios \
--localstatedir=/var/spool/nagios \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
.endif
.if defined(WITH_POSTGRES)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode
pre-fetch:
@${SH} ${SCRIPTDIR}/checkps
pre-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

View file

@ -0,0 +1,11 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -1,9 +1,9 @@
@exec mkdir -p %D/share/nagios/ssi
@exec mkdir -p %D/var/nagios/archives
@exec mkdir -p %D/var/nagios/rw
@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives
@exec chown nagios:nogroup %D/var/nagios/rw
@exec mkdir -p /var/spool/nagios/archives
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
bin/nagios
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
@unexec rmdir %D/var/nagios 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@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

View file

@ -1,10 +0,0 @@
#!/bin/sh
/bin/ps 999999 2>&1 >/dev/null
if [ $? = 0 ]; then
echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
echo "return an error code if a PID does not exist. Nagios needs this!"
exit
else
echo "Great, you have a working ps(1)! Nagios can build."
fi

View file

@ -7,10 +7,10 @@
PORTNAME= nagios
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-1.0
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${PREFIX}/var/nagios \
--localstatedir=/var/spool/nagios \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
.endif
.if defined(WITH_POSTGRES)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode
pre-fetch:
@${SH} ${SCRIPTDIR}/checkps
pre-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

View file

@ -0,0 +1,11 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -1,9 +1,9 @@
@exec mkdir -p %D/share/nagios/ssi
@exec mkdir -p %D/var/nagios/archives
@exec mkdir -p %D/var/nagios/rw
@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives
@exec chown nagios:nogroup %D/var/nagios/rw
@exec mkdir -p /var/spool/nagios/archives
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
bin/nagios
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
@unexec rmdir %D/var/nagios 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@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

View file

@ -1,10 +0,0 @@
#!/bin/sh
/bin/ps 999999 2>&1 >/dev/null
if [ $? = 0 ]; then
echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
echo "return an error code if a PID does not exist. Nagios needs this!"
exit
else
echo "Great, you have a working ps(1)! Nagios can build."
fi

View file

@ -7,10 +7,10 @@
PORTNAME= nagios
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-1.0
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${PREFIX}/var/nagios \
--localstatedir=/var/spool/nagios \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
.endif
.if defined(WITH_POSTGRES)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode
pre-fetch:
@${SH} ${SCRIPTDIR}/checkps
pre-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

View file

@ -0,0 +1,11 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -1,9 +1,9 @@
@exec mkdir -p %D/share/nagios/ssi
@exec mkdir -p %D/var/nagios/archives
@exec mkdir -p %D/var/nagios/rw
@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives
@exec chown nagios:nogroup %D/var/nagios/rw
@exec mkdir -p /var/spool/nagios/archives
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
bin/nagios
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
@unexec rmdir %D/var/nagios 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@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

View file

@ -1,10 +0,0 @@
#!/bin/sh
/bin/ps 999999 2>&1 >/dev/null
if [ $? = 0 ]; then
echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
echo "return an error code if a PID does not exist. Nagios needs this!"
exit
else
echo "Great, you have a working ps(1)! Nagios can build."
fi

View file

@ -7,10 +7,10 @@
PORTNAME= nagios
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-1.0
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${PREFIX}/var/nagios \
--localstatedir=/var/spool/nagios \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \
.endif
.if defined(WITH_POSTGRES)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode
pre-fetch:
@${SH} ${SCRIPTDIR}/checkps
pre-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

View file

@ -0,0 +1,11 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -0,0 +1,11 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

View file

@ -1,9 +1,9 @@
@exec mkdir -p %D/share/nagios/ssi
@exec mkdir -p %D/var/nagios/archives
@exec mkdir -p %D/var/nagios/rw
@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw
@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives
@exec chown nagios:nogroup %D/var/nagios/rw
@exec mkdir -p /var/spool/nagios/archives
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
bin/nagios
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/var/nagios/archives 2>/dev/null || true
@unexec rmdir %D/var/nagios/rw 2>/dev/null || true
@unexec rmdir %D/var/nagios 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
@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

View file

@ -1,10 +0,0 @@
#!/bin/sh
/bin/ps 999999 2>&1 >/dev/null
if [ $? = 0 ]; then
echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime"
echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will"
echo "return an error code if a PID does not exist. Nagios needs this!"
exit
else
echo "Great, you have a working ps(1)! Nagios can build."
fi