diff options
author | Matt Thode <prometheanfire@gentoo.org> | 2013-02-09 21:42:07 +0000 |
---|---|---|
committer | Matt Thode <prometheanfire@gentoo.org> | 2013-02-09 21:42:07 +0000 |
commit | fb9b07eb2f8ed5df8eb1096a5bce880b79dbe0f0 (patch) | |
tree | fc9623b9e1b6b2343ea8d19bb996ac69c6ebe4df /net-analyzer | |
parent | Version bump - bug #455230. Install under /run instead of /var/run - bug #452... (diff) | |
download | historical-fb9b07eb2f8ed5df8eb1096a5bce880b79dbe0f0.tar.gz historical-fb9b07eb2f8ed5df8eb1096a5bce880b79dbe0f0.tar.bz2 historical-fb9b07eb2f8ed5df8eb1096a5bce880b79dbe0f0.zip |
updating icinga to icinga-1.8.4-r1 for bug 456040
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/icinga/ChangeLog | 8 | ||||
-rw-r--r-- | net-analyzer/icinga/Manifest | 29 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.8.4-r1.ebuild | 251 |
3 files changed, 273 insertions, 15 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index c9e309846c8b..d1da3838aff6 100644 --- a/net-analyzer/icinga/ChangeLog +++ b/net-analyzer/icinga/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/icinga # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.36 2013/01/14 21:40:35 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.37 2013/02/09 21:41:59 prometheanfire Exp $ + +*icinga-1.8.4-r1 (09 Feb 2013) + + 09 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> + +icinga-1.8.4-r1.ebuild: + updating to r1 for bug 456040 *icinga-1.8.4 (14 Jan 2013) diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index 2633c9bed865..ad76dfa94a11 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -10,23 +10,24 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966 AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a710e79698c456 SHA512 913e923f297281e6a429ac446a20f6b8e8fadbc5dc5b1a01f1b5d73694ebd43e0931e655194593c8335bfc6505bb47b7321b8d6530c869f1bd8b262ad030faaa WHIRLPOOL 0da5e0702535cb9e07f98cabfad9f6ce0999d5d7a60e66494ca3d4167537343d3d750d48145856affc43d404318c88b98078a8c08b369c6829f5e68555cb7dc5 DIST icinga-1.8.4.tar.gz 7459130 SHA256 e1ecbc6c83bb8b2d4d29934182b101f305c8d45873b0cefe452dd913ee5b6de1 SHA512 4112a6ad78cfedf5106998045f12752ff1c6c55eb347e0e86f8c0e1adfaa678a256c43d5362a6a7952d4c868b00a90a812567ac5d5cd01eb98a8e2a8b346f90e WHIRLPOOL fedebccfa3e9dcc657e72525f6c5b0a7e0a5d70e12b7c2e9c2a621ba658c9007f950be45a6ce85a25bf6dd0d2ca0e62ed0939fe9af964694bfddb124ef3057ed +EBUILD icinga-1.8.4-r1.ebuild 7580 SHA256 5e40c76b943a3f814e01eb85ced6909759b0a1f380004487cfe5e5890404f8ac SHA512 a62314e413e355454014b90742b550c7a483bcf5ca5229d801de90b6beecba10452692b1604f52104c0084fcea604c36ec61b31e2ec7bdb981fbf18cf0b75956 WHIRLPOOL e1c6103be0c02714bc5095c94283029e5c303381f090ae06e9f5992386d1fccead00943602e157396972a61ee50306f782f49b82b20913f6c72cbcbf41d8b02c EBUILD icinga-1.8.4.ebuild 7446 SHA256 7dfc94f282683b44ce2cc30e2afd7f4fbcbbb232ffd24c21e207336955a2bc40 SHA512 91b14e2035bab8ff76dd0860dcc150cd4890440cdd8436581c52f2e3edd8a8fd1e1e10add3a532ee3f7cd405ddf89dce5fbb50cefa4d077ef1a86e8a53938523 WHIRLPOOL 0f15264adbc823693db3b041e3efb05604e071d7dde5a98f09747112e1f2e3400bae548441d66e461462c6d6c1b874e8af14bcde2618279809cd77a74708dee2 -MISC ChangeLog 6514 SHA256 a59b6133a5d583e3b013068d9176d46792a254edc211a5a93c9540d56f10c01e SHA512 994200b6dada7994e1f59679c69debf227ff488ca412261fe1d5caf44d711f234f5bd9a9f2c2d1b4728e649b1b2c8bd1652fb09398ff0f362c1bb2e155a19203 WHIRLPOOL 0d7e2a0c722b91ffa45c3cadc5d980223902a7857904328dd4c948a68944a3712591275642c13a0db0fa6add4d2da76582b9353dd99f7894e2662d14e7fb2fad +MISC ChangeLog 6663 SHA256 b7b2a3135f3492aa09b954d5d7ac2acc056e2f0fcc064d936a79fcf18758e0a0 SHA512 bdcde99ba6263dc5b38c23c3448f98ba46d24595b99855f6912ac84cdfd5bb30334211e741029741c07a5ff457e67d8b0e9337f2a12fa0f2b05c5b9a7db1f5de WHIRLPOOL 40cd44f2aa0205aa55e5b5e3c76620729b92303a9c334e310dedd3928ce03b998934703d8365227890f8bcf7abf173d06fb7880226503b348e8cab2f7cc4504c MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQ9HtZAAoJECRx6z5ArFrDvjIQAK5PrDXxP0z3IiC+Oqg0actq -M4Zs9i1U8WcXxADxNSd0ghBD/cnIQBwSSRs7qUbZdKGvdFLEfV16sMuXWWxSRWkf -fPtfoHCkdlxsaIHZ3FBPWHXV8QEjJfExNebwIYUQ20CGgZW2B5GwoU/kaQp13YBL -SO1lYtonshVmA6b/LSPcUy+RStfZOZI1zmV8RdWcN9XNAaxDvl6BxObLBEFIzZc8 -i3gdG8cyTN5G78xgGaQ4E/q7NMISKcdcfCsGNYIDtuKUY18noDZjKkheKgihyhFz -0P3L/ps+X0WA72qsq+/kx+0TpB0ETcXI4R0X6wtCVdEgjrkhCjKYq51qsxs2998V -rYbm9S9rV05sfbkGesr8UWUzqFpzPTYM2QlRKPoq2g5KNYld+62RrWdbRXOECfVO -6LP+1LNXFqj8fD8zoFeY7sqzx8LznERrJoxW4onZ55vC9Opljs6g7dZ0L+BpIJFu -91sP8ZBwmpkt9KlCq9UmmgKkUGIfZknivmqpFhja0EVTMfY+s1qElB1CXSuMDL+a -X/BFN5oxpiyLHCWpMO9jt69X5vfI0TgSdKQsMXzkheVtONtMbS1C5sqQHd/UEkfQ -kuEPijUdA8wINjQMnBfx8dvOmgZ6hl1/osjcP/eaG+vKKvacFO6F2hfDNhaJWfC1 -NjJZZA3jaksM233Dz4Bm -=AWTs +iQIcBAEBCAAGBQJRFr5bAAoJECRx6z5ArFrDrkkP/itqQ/GcZv/EgnpBkArwWkKy +KQtxcbX1ak7Mb1tMtHWZ+ZuqWlj0pz+DdacwS9YxrFpGH6hdRUBz1Uiw0VX4Ri0w +Lu4CeX8+Muf3eKNYXOj87s8ba0pOfd8vGal6lfqoVDAyJyikcHOBn2jVhEJ+Y3vF +jQfzxqSgtRJVqgpakNSH/6zMohnU4/KACprGYxA6CKodJ40O9CWbq3mk2mrj6LCk +wxupUfpVBwE7FT1bwswheDdjHLvISlfQP/py2kq2mNXpLN+Zu9a8pv5VOJ2cDyht +9+Awm5SvsS19QCtn+00CXcnT/Kr+fen4jPN9I7SDlhONoVB8ErRu/vGHPt0HODhr +q+xFNXk1ora3zRjAWCd5/OmKwoYHuo0ZFV8PgUFgrDF5RMHoinlntpEeu2l1pQsJ +oD0BimEigfW1OTnGi3lC5X8WK0qMXX4ZFgrMl/NMbsW7yRCYbrXdjGZUz1GMnzfr +mR7qHSgvhPuqP+wK/slXKd0GiS0WTR+wMEYI0C1CixoRx+2jJZBqXPFPAyWrctrD +yp9lRoH4c8w6BVB/tmuMqSfdt4oDHyObQlGJEO7rkKOAj4h/9LWmbwNrijj8mfcP +zeTM9wLwqL4tZ8nruT4MTWX4BOozGw2BLoQdjEDG7yokDyXm8dp+BHy6e6sHDRK4 +ra0UhKwgeAg/BidGl2WX +=ghZh -----END PGP SIGNATURE----- diff --git a/net-analyzer/icinga/icinga-1.8.4-r1.ebuild b/net-analyzer/icinga/icinga-1.8.4-r1.ebuild new file mode 100644 index 000000000000..01685d90e798 --- /dev/null +++ b/net-analyzer/icinga/icinga-1.8.4-r1.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.8.4-r1.ebuild,v 1.1 2013/02/09 21:41:59 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 ~hppa ~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 + + 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" + elog + elog "you may want to also add apache to the icinga group" + elog "to allow it access to the AuthUserFile" + elog + 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" + ewarn "update your db with the scripts under the directory" + ewarn "/usr/share/icinga/contrib/db/" + 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 +} |