pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/nagios-nsca - Minor fix to MESSAGE file.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a9d981ba19e
branches:  trunk
changeset: 535722:9a9d981ba19e
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Nov 26 22:14:23 2007 +0000

description:
- Minor fix to MESSAGE file.
- Add NAGIOS_USER user and NAGIOS_GROUP handling.
- Explicitly configure NAGIOS_USER/NAGIOS_GROUP as Nagios NSCA user/group
hence this package now follows NAGIOS_USER and NAGIOS_GROUP settings.
- When deleting the package allow removal of directories shared
with other Nagios packages to fail.
- Bump PKGREVISION to 1

diffstat:

 net/nagios-nsca/MESSAGE  |   6 +++---
 net/nagios-nsca/Makefile |  10 +++++++++-
 net/nagios-nsca/PLIST    |   4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r aeaef80196c8 -r 9a9d981ba19e net/nagios-nsca/MESSAGE
--- a/net/nagios-nsca/MESSAGE   Mon Nov 26 22:14:19 2007 +0000
+++ b/net/nagios-nsca/MESSAGE   Mon Nov 26 22:14:23 2007 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/02/18 17:13:45 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2007/11/26 22:14:23 seb Exp $
 
 Inetd Configuration:
 
@@ -11,12 +11,12 @@
 1) Add a line to your /etc/services file as follows (modify the port
    number as you see fit)
 
-        nsca            5667/tcp        # NSCA
+  nsca            5667/tcp        # NSCA
 
 2) Add an entry to /etc/inetd.conf as follows:
 
 
-        nsca    stream  tcp     nowait  <nscabin> -c <nscacfg> --inetd
+  nsca    stream  tcp     nowait  <user> <nscabin> nsca -c <nscacfg> --inetd
 
 
    - Replace <user> with the name of the user that nsca server should run as.
diff -r aeaef80196c8 -r 9a9d981ba19e net/nagios-nsca/Makefile
--- a/net/nagios-nsca/Makefile  Mon Nov 26 22:14:19 2007 +0000
+++ b/net/nagios-nsca/Makefile  Mon Nov 26 22:14:23 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/26 22:14:23 seb Exp $
 #
 
 DISTNAME=      nsca-2.6
 PKGNAME=       nagios-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    net sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nagios/}
 
@@ -21,6 +22,13 @@
 
 .include "../../net/nagios-base/Makefile.common"
 
+CONFIGURE_ARGS+=       --with-nsca-user=${NAGIOS_USER:Q}
+CONFIGURE_ARGS+=       --with-nsca-grp=${NAGIOS_GROUP:Q}
+
+PKG_GROUPS+=                   ${NAGIOS_GROUP}
+PKG_USERS+=                    ${NAGIOS_USER}:${NAGIOS_GROUP}
+PKG_GECOS.${NAGIOS_USER}=      Nagios Runtime User
+
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/bin
diff -r aeaef80196c8 -r 9a9d981ba19e net/nagios-nsca/PLIST
--- a/net/nagios-nsca/PLIST     Mon Nov 26 22:14:19 2007 +0000
+++ b/net/nagios-nsca/PLIST     Mon Nov 26 22:14:23 2007 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/01 22:43:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/26 22:14:23 seb Exp $
 bin/nsca
 bin/send_nsca
 share/examples/nagios/nsca.cfg
-@dirrm share/examples/nagios
+@unexec ${RMDIR} %D/share/examples/nagios 2>/dev/null || ${TRUE}



Home | Main Index | Thread Index | Old Index