From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 62826138010 for ; Tue, 23 Oct 2012 02:40:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E8CE21C01E; Tue, 23 Oct 2012 02:40:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D44B121C01E for ; Tue, 23 Oct 2012 02:40:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 141E433D862 for ; Tue, 23 Oct 2012 02:40:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9BE90E5436 for ; Tue, 23 Oct 2012 02:40:04 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1350959988.964eceac0f03fa2c66920aa0cf5a3f38424b4772.prometheanfire@gentoo> Subject: [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/ X-VCS-Repository: dev/prometheanfire X-VCS-Files: net-analyzer/icinga/Manifest net-analyzer/icinga/icinga-1.8.0.ebuild X-VCS-Directories: net-analyzer/icinga/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 964eceac0f03fa2c66920aa0cf5a3f38424b4772 X-VCS-Branch: master Date: Tue, 23 Oct 2012 02:40:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f9774af-e3b7-4e87-8bad-1d3c75da82f2 X-Archives-Hash: 63c521e2bfd7696eba372e55eced4f5a commit: 964eceac0f03fa2c66920aa0cf5a3f38424b4772 Author: Matthew Thode gentoo org> AuthorDate: Tue Oct 23 02:39:48 2012 +0000 Commit: Matt Thode gentoo org> CommitDate: Tue Oct 23 02:39:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=964eceac initial add for testing --- net-analyzer/icinga/Manifest | 22 +--- net-analyzer/icinga/icinga-1.8.0.ebuild | 248 +++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+), 20 deletions(-) diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index a89539f..3f340e1 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22 AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f AUX icinga-apache.conf 591 SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df SHA512 f08d6d17fcbd695af43a6e2ca230c001ad5ab2ce4f50c61ed8a41addb1eebc7a6fbbb0a53d72ba5686d5a8d0f21d9a2e9cff98e8ce53e8bd04d9a658300d327a WHIRLPOOL 5b93d216745a5aee353aa03e5054926bf6e0ef8929ce17b174672787254a4b3c9707a3d718ca75619d03436818543434c621f8e97f9914bef616dba2ddc093d1 @@ -10,23 +7,8 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966 AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172db0197ca8123d2 SHA512 c5c6f3245f61bb5deb49438255215624c3286a73dfe6c7ef7f69fb60e497163c2d7766cc6fa14acbbc20505bc278a59afd946a95189d3b952ed817c98b93fd53 WHIRLPOOL f271ad1ad9a7b541420654d2c96f2ac61f0acb484963ac27892a0dbd1889789c721e23313f6f2b4787336531c63b3cd7715e53a19f5ad6f1ff29fba128d5a4bc DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e +DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563 +EBUILD icinga-1.8.0.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563 MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAEBCAAGBQJQV3+9AAoJECRx6z5ArFrDDOYP/j2U3zri7Fj4eixwOfOR5ChJ -1c6Sa72xUXly1lDt5NskeIR9+BxWEHT8vGpIg8MjBKe4auTJ6cz+j5exkE27zibW -mrxbHTTSlDyZ9hpZX6LM7IOcu9xTAHNdgnE9OpK9dcqmz4FqhMKUqZHj6vsA9GXX -ZEOXtdq84StBU7XDwO7/aJ4D1ZK0J/sOpf8kWTF/eKkcYAxW59QFhyK8/vKbEKTj -YGYl4FFFKyf4fcDXm6HkkB7XmTSDoEe81B/+D665gDP8bTbxi3AghGzTLdoDzrpv -1z2QLdDdXFzxu9Lg+2OE/51GKDeU018w1XIqZ584kIc0wu/EPNnBA7pnoMaRkDqG -etaZAlMZwJ1KDrWo5XXMyYLlE2S6nA2BvoJansLsIjN2+Z2MxB7O+n0nykEgYAcD -do8GaNvSkuysBbQJW2ePBhBDAB1onyCGTXoqFYloRQujXJh3CGV8RENYTp0HDkSd -hF9rphmUyjgYZ29jyjOTILfnMpbzUfvERTIoWkUiHDBJmAJrJGcqxA0j0Dl+4QEX -3OAZv8zyzPvv8JBkbskLJTAaLDVDnkgUCn+rHyuD+EHGRhCx9xsZnklUqYM8TEAB -36tSbGsDPkpq4lk3V659H+FpOUzWGEvqY/pa3wA8mCFaOwpXpZRGD2f07NNCNpoH -XAHmqSybBfq7OLYs8vTW -=zSwD ------END PGP SIGNATURE----- diff --git a/net-analyzer/icinga/icinga-1.8.0.ebuild b/net-analyzer/icinga/icinga-1.8.0.ebuild new file mode 100644 index 0000000..55c979b --- /dev/null +++ b/net-analyzer/icinga/icinga-1.8.0.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.2.ebuild,v 1.4 2012/09/17 19:48:49 prometheanfire Exp $ + +EAPI=2 + +inherit depend.apache eutils multilib toolchain-funcs user versionator + +DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" +HOMEPAGE="http://www.icinga.org/" +#MY_PV=$(delete_version_separator 3) +#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz" +#S=${WORKDIR}/${PN}-${MY_PV} +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+apache2 eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" +DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) + perl? ( dev-lang/perl ) + virtual/mailx + web? ( + media-libs/gd[jpeg,png] + lighttpd? ( www-servers/lighttpd ) + ) + !net-analyzer/nagios-core" +RDEPEND="${DEPEND} + plugins? ( net-analyzer/nagios-plugins )" +RESTRICT="test" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup + enewgroup icinga + enewgroup nagios + enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" +} + +src_prepare() { + epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch" +} + +src_configure() { + local myconf + + myconf="$(use_enable perl embedded-perl) + $(use_with perl perlcache) + $(use_enable idoutils) + $(use_enable ssl) + --disable-statuswrl + --with-cgiurl=/icinga/cgi-bin + --with-log-dir=/var/log/icinga + --libdir=/usr/$(get_libdir) + --bindir=/usr/sbin + --sbindir=/usr/$(get_libdir)/icinga/cgi-bin + --datarootdir=/usr/share/icinga/htdocs + --localstatedir=/var/lib/icinga + --sysconfdir=/etc/icinga + --with-lockfile=/var/run/icinga/icinga.lock + --with-temp-dir=/tmp/icinga + --with-temp-file=/tmp/icinga/icinga.tmp" + + if use idoutils ; then + myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock + --with-icinga-chkfile=/var/lib/icinga/icinga.chk + --with-ido-sockfile=/var/lib/icinga/ido.sock + --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" + fi + + if use eventhandler ; then + myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" + fi + + if use plugins ; then + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + else + myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" + fi + + if use !apache2 && use !lighttpd ; then + myconf+=" --with-command-group=icinga" + else + if use apache2 ; then + myconf+=" --with-httpd-conf=/etc/apache2/conf.d" + myconf+=" --with-command-group=apache" + elif use lighttpd ; then + myconf+=" --with-command-group=lighttpd" + fi + fi + + econf ${myconf} +} + +src_compile() { + tc-export CC + + emake icinga || die "make failed" + + if use web ; then + emake DESTDIR="${D}" cgis || die + fi + + if use idoutils ; then + emake DESTDIR="${D}" idoutils || die + fi +} + +src_install() { + dodoc Changelog README UPGRADING || die + + if ! use web ; then + sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die + fi + + emake DESTDIR="${D}" install{,-config,-commandmode} || die + + if use idoutils ; then + emake DESTDIR="${D}" install-idoutils || die + fi + + if use eventhandler ; then + emake DESTDIR="${D}" install-eventhandlers || die + fi + + newinitd "${FILESDIR}"/icinga-init.d icinga || die + newconfd "${FILESDIR}"/icinga-conf.d icinga || die + if use idoutils ; then + newinitd "${FILESDIR}"/ido2db-init.d ido2db || die + newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die + insinto /usr/share/icinga/contrib/db + doins -r module/idoutils/db/* || die + fi + # Apache Module + if use web ; then + if use apache2 ; then + insinto "${APACHE_MODULES_CONFDIR}" + newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die + elif use lighttpd ; then + insinto /etc/lighttpd + newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die + else + ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" + ewarn "out-of-the-box. Since you are not using one of them, you" + ewarn "have to configure your webserver accordingly yourself." + fi + fowners -R root:root /usr/$(get_libdir)/icinga || die + cd "${D}" || die + find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + + find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + + fi + + if use eventhandler ; then + dodir /etc/icinga/eventhandlers || die + fowners icinga:icinga /etc/icinga/eventhandlers || die + fi + + dodir /var/run/icinga || die + fowners icinga:icinga /var/run/icinga || die + + keepdir /etc/icinga + keepdir /var/lib/icinga + keepdir /var/lib/icinga/archives + keepdir /var/lib/icinga/rw + keepdir /var/lib/icinga/spool/checkresults + + if use apache2 ; then + webserver=apache + elif use lighttpd ; then + webserver=lighttpd + else + webserver=icinga + fi + + fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga" + fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw" + + fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw" + fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" +} + +pkg_postinst() { + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "Note that the user your webserver is running as needs" + elog "read-access to /etc/icinga." + elog + if use apache2 || use lighttpd ; then + elog "There are several possible solutions to accomplish this," + elog "choose the one you are most comfortable with:" + elog + if use apache2 ; then + elog " usermod -G icinga apache" + elog "or" + elog " chown icinga:apache /etc/icinga" + elog + elog "Also edit /etc/conf.d/apache2 and add a line like" + elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" + elog + elog "Icinga web service needs user authentication. If you" + elog "use the base configuration, you need a password file" + elog "with a password for user \"icingaadmin\"" + elog "You can create this file by executing:" + elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" + elif use lighttpd ; then + elog " usermod -G icinga lighttpd " + elog "or" + elog " chown icinga:lighttpd /etc/icinga" + elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" + fi + elog + elog "That will make icinga's web front end visable via" + elog "http://localhost/icinga/" + elog + else + elog "IMPORTANT: Do not forget to add the user your webserver" + elog "is running as to the icinga group!" + fi + else + ewarn "Please note that you have installed Icinga without web interface." + ewarn "Please don't file any bugs about having no web interface when you do this." + ewarn "Thank you!" + fi + elog + elog "If you want icinga to start at boot time" + elog "remember to execute:" + elog " rc-update add icinga default" + elog + elog "If your kernel has /proc protection, icinga" + elog "will not be happy as it relies on accessing the proc" + elog "filesystem. You can fix this by adding icinga into" + elog "the group wheel, but this is not recomended." + elog + if [ -d "${ROOT}"/var/icinga ] ; then + ewarn + ewarn "/var/icinga was moved to /var/lib/icinga" + ewarn "please move the files if this was an upgrade" + if use idoutils ; then + ewarn "and edit /etc/ido2db.cfg to change the location of the files" + ewarn "it accesses" + fi + ewarn + ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" + ewarn "remove /var/icinga afterwards to make this warning disappear" + fi +}