diff options
| -rw-r--r-- | net-analyzer/nagios-core/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 14 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/conf.d | 10 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/digest-nagios-core-1.2-r3 | 1 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch | 14 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/metadata.xml | 5 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild | 247 |
7 files changed, 291 insertions, 9 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index 452969431d4d..1ddde96663b0 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.38 2004/08/16 10:37:07 eldad Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.39 2004/08/20 13:38:13 eldad Exp $ + +*nagios-core-1.2-r3 (20 Aug 2004) + + 20 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml, +files/conf.d, + +files/submit_check_result_via_nsca.patch, +nagios-core-1.2-r3.ebuild: + Distributed monitoring friendly - Thanks to Marcel Pommer <marsellus@gmx.net> + for pointing out the issues involved. Closes bug #60642. 16 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild: x86 stable diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 5bddb42e581a..cf947f35b8ad 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,22 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 ba3d132a9c25c4a0002451a2516842e3 nagios-core-1.2-r3.ebuild 7124 MD5 29d3ad573066390a78e460299c042bda nagios-core-1.2-r2.ebuild 6641 -MD5 8086cd8226f37a6b3e045ef61490b79d ChangeLog 6519 -MD5 67125e899e40330692585273a7839c41 metadata.xml 980 +MD5 0137ba795ed9717b55d206767cd5f39f ChangeLog 6841 +MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928 MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133 +MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409 MD5 00bd7731c70a158315e70338cee561a4 files/nagios 916 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224 MD5 f4f0b07e1a52477f83cbb9158db70391 files/tac.cgi.diff.bz2 204 +MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63 +MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFBII83T+MN7JbqCpMRAl9fAJ9aJZkwI9o5PtOxT91GMK+ULm2y2QCeLRzx -di4Wx/x9la6wR5SSXdLKlyA= -=uqY5 +iD8DBQFBJf9OT+MN7JbqCpMRAgYqAJ9HphKRWLPIiS7EN5iArwsDk7UEuwCfRj9g +pjDYQLgnVZN7VHFn0hBG0Vw= +=JbNu -----END PGP SIGNATURE----- diff --git a/net-analyzer/nagios-core/files/conf.d b/net-analyzer/nagios-core/files/conf.d new file mode 100644 index 000000000000..338311a8d1d0 --- /dev/null +++ b/net-analyzer/nagios-core/files/conf.d @@ -0,0 +1,10 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $ + +# Distributed monitoring users will want to configure here the ip/hostname of the central server. +# It will be used by submit_check_result_via_nsca. +NAGIOS_NSCA_HOST="localhost" + + + diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r3 b/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r3 new file mode 100644 index 000000000000..33ac901db72f --- /dev/null +++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.2-r3 @@ -0,0 +1 @@ +MD5 414d70e5269d5b8d7c21bf3ee129309f nagios-1.2.tar.gz 1625322 diff --git a/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch b/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch new file mode 100644 index 000000000000..5f819e2ed6d5 --- /dev/null +++ b/net-analyzer/nagios-core/files/submit_check_result_via_nsca.patch @@ -0,0 +1,14 @@ +--- contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.orig 2004-08-20 14:57:38.462260008 +0300 ++++ contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2004-08-20 15:06:46.647923120 +0300 +@@ -32,7 +32,10 @@ + + NscaBin="/usr/local/nagios/libexec/send_nsca" + NscaCfg="/usr/local/nagios/etc/send_nsca.cfg" +-NagiosHost="nagioshost" ++ ++# Gentoo Linux Users: configure the hostname in /etc/conf.d/nagios ++source /etc/conf.d/nagios ++NagiosHost="${NAGIOS_NSCA_HOST}" + + # create the command line to add to the command file + cmdline="$1;$2;$3;$4" diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml index 123ece640070..d734cf5d5e5e 100644 --- a/net-analyzer/nagios-core/metadata.xml +++ b/net-analyzer/nagios-core/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>netmon</herd> <maintainer> - <email>mboman@gentoo.org</email> - <name>Michael Boman</name> - <description>Interim Maintainer</description> + <email>eldad@gentoo.org</email> + <name>Eldad Zack</name> </maintainer> <longdescription>Nagios is a host and service monitor designed to inform you of network problems before your clients, end-users or managers do. It has been designed to run under the Linux operating system, but works fine under most *NIX variants as well. The monitoring daemon runs intermittent checks on hosts and services you specify using external "plugins" which return status information to Nagios. When problems are encountered, the daemon can send notifications out to administrative contacts in a variety of different ways (email, instant message, SMS, etc.). Current status information, historical logs, and reports can all be accessed via a web browser.</longdescription> </pkgmetadata> diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild new file mode 100644 index 000000000000..e374f2560bcd --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.1 2004/08/20 13:38:13 eldad Exp $ + +inherit eutils + +MY_P=${P/-core} +DESCRIPTION="Nagios Core - Check daemon, CGIs, docs" +HOMEPAGE="http://www.nagios.org/" +SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz" +RESTRICT="nomirror" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~amd64" +IUSE="noweb mysql postgres perl debug apache2" + +DEPEND="virtual/mailx + !noweb? ( + >=media-libs/jpeg-6b-r3 + >=media-libs/libpng-1.2.5-r4 + >=media-libs/gd-1.8.3-r5 + + apache2? ( >=net-www/apache-2.0.43-r1 ) + !apache2? ( <net-www/apache-2 ) + ) + + perl? ( >=dev-lang/perl-5.6.1-r7 ) + mysql? ( >=dev-db/mysql-3.23.56 ) + postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + # If there's a gd lib on the system, it will try to build with it. + # check if gdlib-config is on, and then check its output. + if [[ -x /usr/bin/gdlib-config ]]; then + if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then + eerror "Your gd has been compiled without jpeg support." + eerror "Please re-emerge gd:" + eerror "# USE="jpeg" emerge gd" + die "pkg_setup failed" + fi + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/submit_check_result_via_nsca.patch + + epatch ${FILESDIR}/Makefile-distclean.diff.bz2 + cp ${FILESDIR}/nagios.cfg-sample.gz ./ + gunzip nagios.cfg-sample.gz +} + +src_compile() { + local myconf + + if use mysql && use postgres; then + ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time." + ewarn "Using MySQL as default." + + has_version ">=sys-apps/portage-2.0.50" && ( + einfo "You can add -" + echo "" + einfo "net-analyzer/nagios-core [use flags]" + echo "" + einfo "to /etc/portage/package.use to permanently set this package's USE flags" + einfo "More info on package.use is available on:" + einfo " man 5 portage" + ) + elif use postgres ; then + myconf="${myconf} --with-pgsql-xdata" + + if [ -r /usr/include/postgresql/pgsql/libpq-fe.h ] ; then + myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql" + fi + fi + + use mysql && myconf="${myconf} --with-mysql-xdata" + + use perl && myconf="${myconf} \ + --enable-embedded-perl \ + --with-perlcache" + + if use debug; then + myconf="${myconf} --enable-DEBUG0" + myconf="${myconf} --enable-DEBUG1" + myconf="${myconf} --enable-DEBUG2" + myconf="${myconf} --enable-DEBUG3" + myconf="${myconf} --enable-DEBUG4" + myconf="${myconf} --enable-DEBUG5" + fi + + if use noweb; then + myconf="${myconf} --with-command-grp=nagios" + else + myconf="${myconf} --with-command-grp=apache" + fi + + ./configure ${myconf} \ + --host=${CHOST} \ + --prefix=/usr/nagios \ + --localstatedir=/var/nagios \ + --sysconfdir=/etc/nagios \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + ${myconf} || die "./configure failed" + + make DESTDIR=${D} nagios contrib || die "make failed" + + use noweb || make DESTDIR=${D} cgis # Only compile the CGI's if "noweb" useflag is not set. +} + +src_install() { + dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING + + if use noweb; then + sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile + sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile + fi + + make DESTDIR=${D} install + make DESTDIR=${D} install-config + make DESTDIR=${D} install-commandmode + + docinto sample-configs + dodoc ${D}/etc/nagios/* + rm ${D}/etc/nagios/* + + dodoc ${S}/nagios.cfg-sample + + exeinto /etc/init.d + doexe ${FILESDIR}/nagios + + insinto /etc/conf.d + newins ${FILESDIR}/conf.d nagios + + insinto /usr/nagios/contrib + doins contrib/* + + #contribs are not configured by the configure script, we'll configure them overselves... + find ${S}/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:; + s:/usr/local/nagios/libexec:/usr/nagios/libexec:; + s:/usr/local/nagios/etc:/etc/nagios:; + s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i + + insinto /usr/nagios/contrib/database + doins contrib/database/* + + exeinto /usr/nagios/contrib/eventhandlers + doexe contrib/eventhandlers/* + + exeinto /usr/nagios/contrib/eventhandlers/distributed-monitoring + doexe contrib/eventhandlers/distributed-monitoring/* + + exeinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1 + doexe contrib/eventhandlers/redundancy-scenario1/* +} + +pkg_preinst() { + einfo "Sample config files installed by default will always" + einfo "include cgi.cfg" + einfo "The sample configs can be found in /usr/share/doc/${PF}/sample-configs/" + + keepdir /var/nagios + keepdir /var/nagios/archives + keepdir /usr/nagios/share/ssi + keepdir /var/nagios/rw + + enewgroup nagios + + if use noweb; then + chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" + enewuser nagios -1 /bin/bash /dev/null nagios + else + chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw" + enewuser nagios -1 /bin/bash /dev/null apache + usermod -G apache nagios + fi + + for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib + do + chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}" + done +} + +pkg_postinst() { + einfo + einfo "Remember to edit the config files in /etc/nagios" + einfo "Also, if you want nagios to start at boot time" + einfo "remember to execute:" + einfo " rc-update add nagios default" + einfo + + if ! use noweb; then + einfo "This does not include cgis that are perl-dependent" + einfo "Currently traceroute.cgi is perl-dependent" + einfo "To have ministatus.cgi requires copying of ministatus.c" + einfo "to cgi directory for compiling." + + if use apache2; then + insinto /etc/apache2/conf/modules.d + doins ${FILESDIR}/99_nagios.conf + + einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" + else + insinto /etc/apache/conf/addon-modules + doins ${FILESDIR}/nagios.conf + echo "Include conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf + + einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\"" + fi + + einfo + einfo "That will make nagios's web front end visable via" + einfo "http://localhost/nagios/" + einfo + + else + einfo "Please note that you have installed Nagios without web interface." + einfo "Please don't file any bugs about having no web interface when you do this." + einfo "Thank you!" + fi + + if use mysql && use postgres; then + ewarn "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time." + ewarn "as a default, MySQL support was built." + ewarn "To build nagios with PostgreSQL you'll have to emerge nagios without the mysql useflag." + fi + + einfo + einfo "If you are using distributed monitoring, checkout the contrib scripts." + einfo "configure the central nagios server for the nsca in /etc/conf.d/nagios." + einfo + einfo "If your kernel has /proc protection, nagios" + einfo "will not be happy as it relies on accessing the proc" + einfo "filesystem. You can fix this by adding nagios into" + einfo "the group wheel, but this is not recomended." + einfo +} + +pkg_prerm() { + /etc/init.d/nagios stop +} |