Mon Jun 9 12:36:15 2008 UTC ()
In rc.d script, mkdir and chown /var/run/nagios so that nagios can
write the pid file.  PKGREVISION++.

OK tonnerre@.


(gdt)
diff -r1.17 -r1.18 pkgsrc/net/nagios-base/Makefile
diff -r1.4 -r1.5 pkgsrc/net/nagios-base/files/nagios.sh
cvs diff -r1.17 -r1.18 pkgsrc/net/nagios-base/Makefile (switch to unified diff)

--- pkgsrc/net/nagios-base/Makefile 2008/03/18 21:53:41 1.17
+++ pkgsrc/net/nagios-base/Makefile 2008/06/09 12:36:15 1.18
@@ -1,76 +1,76 @@ @@ -1,76 +1,76 @@
1# $NetBSD: Makefile,v 1.17 2008/03/18 21:53:41 tonnerre Exp $ 1# $NetBSD: Makefile,v 1.18 2008/06/09 12:36:15 gdt Exp $
2# 2#
3 3
4DISTNAME= nagios-2.5 4DISTNAME= nagios-2.5
5PKGNAME= ${DISTNAME:S/-/-base-/} 5PKGNAME= ${DISTNAME:S/-/-base-/}
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= net sysutils 7CATEGORIES= net sysutils
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
9 9
10MAINTAINER= tonnerre@NetBSD.org 10MAINTAINER= tonnerre@NetBSD.org
11HOMEPAGE= http://www.nagios.org/ 11HOMEPAGE= http://www.nagios.org/
12COMMENT= Network monitor 12COMMENT= Network monitor
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15.include "../../net/nagios-base/Makefile.common" 15.include "../../net/nagios-base/Makefile.common"
16.include "options.mk" 16.include "options.mk"
17 17
18CONFIGURE_ARGS+= --with-gd-lib=${LOCALBASE}/lib 18CONFIGURE_ARGS+= --with-gd-lib=${LOCALBASE}/lib
19CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include 19CONFIGURE_ARGS+= --with-gd-inc=${LOCALBASE}/include
20CONFIGURE_ARGS+= --enable-embedded-perl 20CONFIGURE_ARGS+= --enable-embedded-perl
21CONFIGURE_ARGS+= --with-perlcache 21CONFIGURE_ARGS+= --with-perlcache
22 22
23CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER:Q} 23CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER:Q}
24CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP:Q} 24CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP:Q}
25CONFIGURE_ARGS+= --with-command-user=${NAGIOS_USER:Q} 25CONFIGURE_ARGS+= --with-command-user=${NAGIOS_USER:Q}
26CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP:Q} 26CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP:Q}
27CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d 27CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d
28CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios.lock 28CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios.lock
29 29
30USE_TOOLS+= mail:run perl 30USE_TOOLS+= mail:run perl
31CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail} 31CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail}
32 32
33RCD_SCRIPTS+= nagios 33RCD_SCRIPTS+= nagios
34 34
35INSTALL_TARGET= install install-config 35INSTALL_TARGET= install install-config
36 36
37BUILD_DEFS+= VARBASE 37BUILD_DEFS+= VARBASE
38 38
39PKG_GROUPS+= ${NAGIOS_GROUP} 39PKG_GROUPS+= ${NAGIOS_GROUP}
40PKG_GROUPS+= ${NAGIOSCMD_GROUP} 40PKG_GROUPS+= ${NAGIOSCMD_GROUP}
41 41
42PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP} 42PKG_USERS+= ${NAGIOS_USER}:${NAGIOS_GROUP}
43 43
44PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User 44PKG_GECOS.${NAGIOS_USER}= Nagios Runtime User
45 45
46MESSAGE_SUBST+= NAGIOS_USER=${NAGIOS_USER} 46MESSAGE_SUBST+= NAGIOS_USER=${NAGIOS_USER}
47MESSAGE_SUBST+= NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP} 47MESSAGE_SUBST+= NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP}
48 48
49EGDIR= ${PREFIX}/share/examples/nagios 49EGDIR= ${PREFIX}/share/examples/nagios
50EGFILES= cgi.cfg checkcommands.cfg minimal.cfg 50EGFILES= cgi.cfg checkcommands.cfg minimal.cfg
51EGFILES+= misccommands.cfg nagios.cfg resource.cfg 51EGFILES+= misccommands.cfg nagios.cfg resource.cfg
52 52
53.for files in ${EGFILES} 53.for files in ${EGFILES}
54CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files} 54CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
55.endfor 55.endfor
56CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf 56CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf
57 57
58OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 58OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
59OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 59OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775
60OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 60OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
61 61
62SUBST_CLASSES+= files 62SUBST_CLASSES+= files
63SUBST_STAGE.files= post-build 63SUBST_STAGE.files= post-build
64SUBST_FILES.files= nagios.conf.dist 64SUBST_FILES.files= nagios.conf.dist
65SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" 65SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g"
66SUBST_MESSAGE.files= Fixing configuration files. 66SUBST_MESSAGE.files= Fixing configuration files.
67 67
68pre-build: 68pre-build:
69 ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist 69 ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist
70 70
71post-install: 71post-install:
72 ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${EGDIR}/nagios.conf 72 ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${EGDIR}/nagios.conf
73 73
74.include "../../graphics/gd/buildlink3.mk" 74.include "../../graphics/gd/buildlink3.mk"
75.include "../../lang/perl5/buildlink3.mk" 75.include "../../lang/perl5/buildlink3.mk"
76.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/nagios-base/files/nagios.sh (switch to unified diff)

--- pkgsrc/net/nagios-base/files/nagios.sh 2007/11/26 22:14:14 1.4
+++ pkgsrc/net/nagios-base/files/nagios.sh 2008/06/09 12:36:15 1.5
@@ -1,27 +1,35 @@ @@ -1,27 +1,35 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: nagios.sh,v 1.4 2007/11/26 22:14:14 seb Exp $ 3# $NetBSD: nagios.sh,v 1.5 2008/06/09 12:36:15 gdt Exp $
4# 4#
5# PROVIDE: nagios 5# PROVIDE: nagios
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7 7
8. /etc/rc.subr 8. /etc/rc.subr
9 9
10name="nagios" 10name="nagios"
11rcvar=$name 11rcvar=$name
12command="@PREFIX@/bin/${name}" 12command="@PREFIX@/bin/${name}"
13pidfile="/var/run/${name}.lock" 13piddir="/var/run/${name}"
 14pidfile="${piddir}/${name}.lock"
14config="@PKG_SYSCONFDIR@/${name}.cfg" 15config="@PKG_SYSCONFDIR@/${name}.cfg"
15 16
16command_args="-d $config" 17command_args="-d $config"
17  18
 19start_precmd="nagios_precmd"
18test_cmd="nagios_test" 20test_cmd="nagios_test"
19extra_commands="test reload" 21extra_commands="test reload"
20 22
 23nagios_precmd()
 24{
 25 mkdir -p ${piddir}
 26 chown nagios ${piddir}
 27}
 28
21nagios_test() 29nagios_test()
22{ 30{
23 $command -v $config 31 $command -v $config
24} 32}
25 33
26load_rc_config $name 34load_rc_config $name
27run_rc_command "$1" 35run_rc_command "$1"