pkgsrc-Users archive

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

Nagios packages changes



Hi,
I'd like to make some changes to the Nagios packages and would like
to give the opportunity to the users of these packages to comment on
them.

* Sync users and groups usage with Nagios install documentation/recommendations
** create a Nagios user and its group (ok the existing packages already do
that) and make them user-settable at package build time.
** create a "external command" Nagios group, id est a "http server
group" and use this as the "command group". It
would be user-settable at package build time and would
defaults to the apache group. The message displayed at package
installation time will suggest that the nagios user should be added
to the external command group (the pkgsrc framework does not permit
to specify multiple group for a user).
** drop the 'Nagios Administrator' user provided by the nagios-base
package: I do not understand its purpose.

* Introduce a base directory for log files and status files via the
user-settable variable NAGIOSDIR which would defaults to
$VARBASE/spool/nagios.
Right now the packages spread the log files and status files in
$VARBASE/log/nagios and /var/run/nagios. The last path is puzzling
me as it means that most of the time the directory /var/run/nagios
has to be created each time the system is booted and nothing in
the nagios-base package supplied startup script arranges for that.

Note I would keep /var/run/nagios.lock as pidfile.

* Make $PREFIX/libexec/nagios/check_icmp group owned by the Nagios
user so it could be used by Nagios daemon out of the box.

As added bonus I'll update the nagios packages of course :)

Comments ?

Cheers, Stoned.

Attached you'll find diffs implementing these changes (note that you
will need to remove the file pkgsrc/net/nagios-base/patches/patch-ag after
applying them).
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.165
diff -u -r1.165 mk.conf
--- mk/defaults/mk.conf 4 Nov 2007 23:53:44 -0000       1.165
+++ mk/defaults/mk.conf 19 Nov 2007 11:33:46 -0000
@@ -1364,6 +1364,28 @@
 # Possible: none, compolex, all or list selected from MYSQL_CHARSET's
 #          possible values.
 
+NAGIOS_GROUP?= nagios
+# The group for Nagios user.
+# Possible: any group name.
+# Default: the same as the Nagios user
+
+NAGIOS_USER?=  nagios
+# The unprivileged user for Nagios.
+# Possible: any user name.
+# Default: nagios
+
+NAGIOSCMD_GROUP?=      ${APACHE_GROUP}
+# The group for Nagios "external commands". It must be should be
+# one of the groups of the user the HTTP server used is running as.
+# The Nagios user must also be a member of this group.
+# Possible: any user name.
+# Default: ${APACHE_GROUP}
+
+NAGIOSDIR?=    ${VARBASE}/spool/nagios
+# Directory where Nagios status, log files etc.. are hold
+# Possible: any directory.
+# Default: ${VARBASE}/spool/nagios
+
 NMH_EDITOR?= vi
 # default editor for use in nmh.
 # Possible: any editor.
Index: net/nagios-base/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE
--- net/nagios-base/MESSAGE     18 Feb 2006 17:12:20 -0000      1.1.1.1
+++ net/nagios-base/MESSAGE     19 Nov 2007 11:33:46 -0000
@@ -5,9 +5,11 @@
 You must add this in your httpd.conf file:
   Include ${PKG_SYSCONFDIR}/nagios.conf
 
+You should add the ${NAGIOS_USER} user to the group ${NAGIOSCMD_GROUP}.
+
 See the manual for more instructions.
 
 /etc/rc.d startup script:
-Please look in /usr/pkg/share/examples/rc.d/ for a nagios startup script.
+Please look in ${PREFIX}/share/examples/rc.d/ for a nagios startup script.
 
 ===========================================================================
Index: net/nagios-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net/nagios-base/Makefile    12 Oct 2007 16:13:52 -0000      1.14
+++ net/nagios-base/Makefile    19 Nov 2007 11:33:46 -0000
@@ -3,7 +3,7 @@
 
 DISTNAME=              nagios-2.5
 PKGNAME=               ${DISTNAME:S/-/-base-/}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            net sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=nagios/}
 
@@ -22,10 +22,10 @@
 
 CONFIGURE_ARGS+=       --with-nagios-user=${NAGIOS_USER:Q}
 CONFIGURE_ARGS+=       --with-nagios-group=${NAGIOS_GROUP:Q}
-CONFIGURE_ARGS+=       --with-command-user=${ROOT_USER:Q}
-CONFIGURE_ARGS+=       --with-command-grp=${ROOT_GROUP:Q}
+CONFIGURE_ARGS+=       --with-command-user=${NAGIOS_USER:Q}
+CONFIGURE_ARGS+=       --with-command-group=${NAGIOSCMD_GROUP:Q}
 CONFIGURE_ARGS+=       --with-init-dir=${PREFIX}/share/examples/rc.d
-CONFIGURE_ARGS+=       --with-lockfile=/var/run/nagios/nagios.lock
+CONFIGURE_ARGS+=       --with-lockfile=/var/run/nagios.lock
 
 USE_TOOLS+=            mail:run
 CONFIGURE_ARGS+=       --with-mail=${TOOLS_PLATFORM.mail}
@@ -37,15 +37,14 @@
 BUILD_DEFS+=           VARBASE
 
 PKG_GROUPS+=           ${NAGIOS_GROUP}
-PKG_GROUPS+=           ${NAGIOSADM_GROUP}
+PKG_GROUPS+=           ${NAGIOSCMD_GROUP}
 
 PKG_USERS+=            ${NAGIOS_USER}:${NAGIOS_GROUP}
-PKG_USERS+=            ${NAGIOSADM_USER}:${NAGIOSADM_GROUP}
 
 PKG_GECOS.${NAGIOS_USER}=      Nagios Runtime User
-PKG_GECOS.${NAGIOSADM_USER}=   Nagios Administrator
-PKG_HOME.${NAGIOSADM_USER}=    ${PKG_SYSCONFDIR}
-PKG_SHELL.${NAGIOSADM_USER}=   ${SH}
+
+MESSAGE_SUBST+=                NAGIOS_USER=${NAGIOS_USER}
+MESSAGE_SUBST+=                NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP}
 
 EGDIR=                 ${PREFIX}/share/examples/nagios
 EGFILES=               cgi.cfg checkcommands.cfg contactgroups.cfg contacts.cfg
@@ -58,10 +57,9 @@
 .endfor
 CONF_FILES+=           ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
 
-NAGIOS_DIRS=           log/nagios log/nagios/archives run/nagios run/nagios/rw
-.for dir in ${NAGIOS_DIRS}
-OWN_DIRS_PERMS+=       ${VARBASE}/${dir} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
-.endfor
+OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
+OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
+OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     post-build
Index: net/nagios-base/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/Makefile.common,v
retrieving revision 1.6
diff -u -r1.6 Makefile.common
--- net/nagios-base/Makefile.common     12 Oct 2007 16:13:52 -0000      1.6
+++ net/nagios-base/Makefile.common     19 Nov 2007 11:33:46 -0000
@@ -1,14 +1,8 @@
 # $NetBSD: Makefile.common,v 1.6 2007/10/12 16:13:52 ghen Exp $
 #
 
-NAGIOS_USER?=          nagios
-NAGIOS_GROUP?=         ${NAGIOS_USER}
-
-NAGIOSADM_USER?=       nagadmin
-NAGIOSADM_GROUP?=      ${NAGIOSADM_USER}
-
-PKG_GROUPS_VARS+=      NAGIOS_GROUP NAGIOSADM_GROUP
-PKG_USERS_VARS+=       NAGIOS_USER NAGIOSADM_USER
+PKG_GROUPS_VARS+=      NAGIOS_GROUP NAGIOSCMD_GROUP
+PKG_USERS_VARS+=       NAGIOS_USER
 
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            gmake
@@ -20,7 +14,7 @@
 CONFIGURE_ARGS+=       --libexecdir=${PREFIX}/libexec/nagios
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/nagios
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --localstatedir=/var
+CONFIGURE_ARGS+=       --localstatedir=${NAGIOSDIR:Q}
 
 CONFIGURE_ARGS+=       --with-cgiurl=/nagios/cgi-bin
 CONFIGURE_ARGS+=       --with-htmurl=/nagios
Index: net/nagios-base/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- net/nagios-base/distinfo    4 May 2007 04:53:03 -0000       1.5
+++ net/nagios-base/distinfo    19 Nov 2007 11:33:46 -0000
@@ -3,11 +3,10 @@
 SHA1 (nagios-2.5.tar.gz) = 00e6bc45c5634649b6a1be2758ec181197d38f76
 RMD160 (nagios-2.5.tar.gz) = a0f1890ed546ce026cf784ae3ca83119275bd529
 Size (nagios-2.5.tar.gz) = 1736167 bytes
-SHA1 (patch-aa) = b6095ba8e0555d78dd1f857c6a12bc03d97ee602
-SHA1 (patch-ab) = 5d9b0eecd2fdfa00e8412d61f9b54afaa71a97f3
-SHA1 (patch-ac) = ae45c87966641bd3374ee77af7109f19f906d1c0
-SHA1 (patch-ad) = f1b3979d977f78f5b02487809558693a963f2d40
-SHA1 (patch-ae) = 21f34726d239b4dacd17a94b80cbe030f76a2bbc
-SHA1 (patch-af) = 5690e6e4a6259fe8527faa1e8a77eeb5bf4b955f
-SHA1 (patch-ag) = 041dbc9a589ea3c3ced0532a2c1a99e7d0bca584
+SHA1 (patch-aa) = 7d13c606bf9c17850bdc49b07bf31b00a9d10f05
+SHA1 (patch-ab) = 5b33da97bc1339d9c7507cf7ed706ee27ae7c68a
+SHA1 (patch-ac) = b72c80203f7c1c88f851a13c9031bc5a4febf512
+SHA1 (patch-ad) = 2d7c6620ed08a64c8df2d26083fa327899305004
+SHA1 (patch-ae) = 088bddbbd8d6a9f6b7aff89f238d510959a7220b
+SHA1 (patch-af) = a1b2c3a51b0ed72ff0f507bacc44a0d0c5924d60
 SHA1 (patch-ah) = 88122296f9d74648c3dadbd7f6e12e7ef1f32081
Index: net/nagios-base/files/nagios.sh
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/files/nagios.sh,v
retrieving revision 1.3
diff -u -r1.3 nagios.sh
--- net/nagios-base/files/nagios.sh     11 Oct 2007 19:24:36 -0000      1.3
+++ net/nagios-base/files/nagios.sh     19 Nov 2007 11:33:46 -0000
@@ -10,7 +10,7 @@
 name="nagios"
 rcvar=$name
 command="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}/${name}.lock"
+pidfile="/var/run/${name}.lock"
 config="@PKG_SYSCONFDIR@/${name}.cfg"
 
 command_args="-d $config"
Index: net/nagios-base/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- net/nagios-base/patches/patch-aa    4 May 2007 04:53:03 -0000       1.3
+++ net/nagios-base/patches/patch-aa    19 Nov 2007 11:33:46 -0000
@@ -1,14 +1,12 @@
 $NetBSD: patch-aa,v 1.3 2007/05/04 04:53:03 grant Exp $
 
---- Makefile.in.orig   2006-05-31 02:31:44.000000000 +1000
+--- Makefile.in.orig   2006-05-30 16:31:44.000000000 +0000
 +++ Makefile.in
-@@ -21,16 +21,17 @@ LDFLAGS=@LDFLAGS@ @LIBS@
- 
+@@ -22,15 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
--LOGDIR=@localstatedir@
+ LOGDIR=@localstatedir@
 -CFGDIR=@sysconfdir@
-+LOGDIR=@localstatedir@/log/nagios
 +CGIDIR=@libexecdir@
  BINDIR=@bindir@
  CGIDIR=@sbindir@
Index: net/nagios-base/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- net/nagios-base/patches/patch-ab    17 Aug 2006 14:19:00 -0000      1.2
+++ net/nagios-base/patches/patch-ab    19 Nov 2007 11:33:46 -0000
@@ -1,13 +1,9 @@
 $NetBSD: patch-ab,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- cgi/Makefile.in.orig       2006-05-31 01:31:44.000000000 +0900
+--- cgi/Makefile.in.orig       2006-05-30 16:31:44.000000000 +0000
 +++ cgi/Makefile.in
-@@ -12,10 +12,10 @@ SRC_XDATA=../xdata
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--LOGDIR=@localstatedir@
-+LOGDIR=@localstatedir@/log/nagios
+@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
 -CGIDIR=@sbindir@
Index: net/nagios-base/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- net/nagios-base/patches/patch-ac    17 Aug 2006 14:19:00 -0000      1.2
+++ net/nagios-base/patches/patch-ac    19 Nov 2007 11:33:46 -0000
@@ -1,13 +1,9 @@
 $NetBSD: patch-ac,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- base/Makefile.in.orig      2006-05-31 01:31:44.000000000 +0900
+--- base/Makefile.in.orig      2006-05-30 16:31:44.000000000 +0000
 +++ base/Makefile.in
-@@ -26,10 +26,10 @@ LIBS=@LIBS@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--LOGDIR=@localstatedir@
-+LOGDIR=@localstatedir@/log/nagios
+@@ -29,7 +29,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
 -CGIDIR=@sbindir@
Index: net/nagios-base/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- net/nagios-base/patches/patch-ad    17 Aug 2006 14:19:00 -0000      1.2
+++ net/nagios-base/patches/patch-ad    19 Nov 2007 11:33:46 -0000
@@ -1,13 +1,9 @@
 $NetBSD: patch-ad,v 1.2 2006/08/17 14:19:00 taca Exp $
 
---- html/Makefile.in.orig      2006-05-31 01:31:44.000000000 +0900
+--- html/Makefile.in.orig      2006-05-30 16:31:44.000000000 +0000
 +++ html/Makefile.in
-@@ -4,10 +4,10 @@ LDFLAGS=@LDFLAGS@ @LIBS@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--LOGDIR=@localstatedir@
-+LOGDIR=@localstatedir@/log/nagios
+@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
 -CGIDIR=@sbindir@
Index: net/nagios-base/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-ae,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ae
--- net/nagios-base/patches/patch-ae    18 Feb 2006 17:12:20 -0000      1.1.1.1
+++ net/nagios-base/patches/patch-ae    19 Nov 2007 11:33:46 -0000
@@ -1,13 +1,9 @@
 $NetBSD: patch-ae,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
 
---- common/Makefile.in.orig    2003-04-10 05:46:01.000000000 +0200
-+++ common/Makefile.in 2005-10-14 20:04:02.000000000 +0200
-@@ -14,10 +14,10 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--LOGDIR=@localstatedir@
-+LOGDIR=@localstatedir@/log/nagios
+--- common/Makefile.in.orig    2003-04-10 03:46:01.000000000 +0000
++++ common/Makefile.in
+@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
 -CGIDIR=@sbindir@
Index: net/nagios-base/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-base/patches/patch-af,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-af
--- net/nagios-base/patches/patch-af    18 Feb 2006 17:12:20 -0000      1.1.1.1
+++ net/nagios-base/patches/patch-af    19 Nov 2007 11:33:46 -0000
@@ -1,53 +1,8 @@
 $NetBSD: patch-af,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $
 
---- sample-config/nagios.cfg.in.orig   2005-11-23 23:28:03.000000000 +0100
-+++ sample-config/nagios.cfg.in        2006-01-26 22:10:40.000000000 +0100
-@@ -16,7 +16,7 @@
- # for historical purposes.  This should be the first option specified 
- # in the config file!!!
- 
--log_file=@localstatedir@/nagios.log
-+log_file=@localstatedir@/log/nagios/nagios.log
- 
- 
- 
-@@ -100,7 +100,7 @@
- # The contents of the status file are deleted every time Nagios
- #  restarts.
- 
--status_file=@localstatedir@/status.dat
-+status_file=@localstatedir@/log/nagios/status.dat
- 
- 
- 
-@@ -159,7 +159,7 @@
- # directory level instead of on the file, as the file is deleted every
- # time its contents are processed.
- 
--command_file=@localstatedir@/rw/nagios.cmd
-+command_file=@localstatedir@/run/nagios/rw/nagios.cmd
- 
- 
- 
-@@ -167,7 +167,7 @@
- # This is the file that Nagios will use for storing host and service
- # comments.
- 
--comment_file=@localstatedir@/comments.dat
-+comment_file=@localstatedir@/log/nagios/comments.dat
- 
- 
- 
-@@ -175,7 +175,7 @@
- # This is the file that Nagios will use for storing host and service
- # downtime data.
- 
--downtime_file=@localstatedir@/downtime.dat
-+downtime_file=@localstatedir@/log/nagios/downtime.dat
- 
- 
- 
-@@ -193,7 +193,7 @@
+--- sample-config/nagios.cfg.in.orig   2005-11-23 22:28:03.000000000 +0000
++++ sample-config/nagios.cfg.in
+@@ -193,7 +193,7 @@ lock_file=@lockfile@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -56,21 +11,3 @@
  
  
  
-@@ -240,7 +240,7 @@
- # This is the directory where archived (rotated) log files should be 
- # placed (assuming you've chosen to do log rotation).
- 
--log_archive_path=@localstatedir@/archives
-+log_archive_path=@localstatedir@/log/nagios/archives
- 
- 
- 
-@@ -506,7 +506,7 @@
- # This file is used only if the preserve_state_information
- # variable is set to 1.
- 
--state_retention_file=@localstatedir@/retention.dat
-+state_retention_file=@localstatedir@/run/nagios/retention.dat
- 
- 
- 
Index: net/nagios-nrpe/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-nrpe/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- net/nagios-nrpe/Makefile    4 Jul 2007 20:54:51 -0000       1.8
+++ net/nagios-nrpe/Makefile    19 Nov 2007 11:33:46 -0000
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://sourceforge.net/projects/nagios/
 COMMENT=               Nagios remote program execution daemon
 
+.include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            perl
 USE_PKGINSTALL=                yes
@@ -18,11 +20,8 @@
 CONFIGURE_ARGS+=       --libexecdir=${PREFIX}/libexec/nagios
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-NAGIOS_USER?=          nagios
-NAGIOS_GROUP?=         ${NAGIOS_USER}
-
-PKG_GROUPS+=           ${NAGIOS_GROUP}
-PKG_USERS+=            ${NAGIOS_USER}:${NAGIOS_GROUP}
+PKG_GROUPS+=                   ${NAGIOS_GROUP}
+PKG_USERS+=                    ${NAGIOS_USER}:${NAGIOS_GROUP}
 PKG_GECOS.${NAGIOS_USER}=      Nagios Runtime User
 
 PKG_GROUPS_VARS+=      NAGIOS_GROUP
Index: net/nagios-nsca/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-nsca/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE
--- net/nagios-nsca/MESSAGE     18 Feb 2006 17:13:45 -0000      1.1.1.1
+++ net/nagios-nsca/MESSAGE     19 Nov 2007 11:33:46 -0000
@@ -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.
Index: net/nagios-nsca/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-nsca/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- net/nagios-nsca/Makefile    22 Feb 2007 19:26:56 -0000      1.5
+++ net/nagios-nsca/Makefile    19 Nov 2007 11:33:46 -0000
@@ -21,6 +21,9 @@
 
 .include "../../net/nagios-base/Makefile.common"
 
+CONFIGURE_ARGS+=       --with-nsca-user=${NAGIOS_USER:Q}
+CONFIGURE_ARGS+=       --with-nsca-grp=${NAGIOS_GROUP:Q}
+
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/bin
Index: net/nagios-plugins/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nagios-plugins/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net/nagios-plugins/Makefile 30 Mar 2007 05:52:37 -0000      1.9
+++ net/nagios-plugins/Makefile 19 Nov 2007 11:33:46 -0000
@@ -18,6 +18,8 @@
                --without-smbclient-command --without-snmpget-command \
                --without-snmpgetnext-command --without-fping-command
 
+SPECIAL_PERMS+=        ${PREFIX}/libexec/nagios/check_icmp ${REAL_ROOT_USER} 
${NAGIOS_GROUP} 4550
+
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=       --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
 .endif


Home | Main Index | Thread Index | Old Index