diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2013-11-10 23:20:10 +0000 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2013-11-10 23:20:10 +0000 |
commit | c5808f656c6935fa84edc40d98cc0a2653763693 (patch) | |
tree | f4b2e225f98039903c04e8ca66be79ab0d817a63 /net-analyzer/icinga | |
parent | Version bumps (diff) | |
download | gentoo-2-c5808f656c6935fa84edc40d98cc0a2653763693.tar.gz gentoo-2-c5808f656c6935fa84edc40d98cc0a2653763693.tar.bz2 gentoo-2-c5808f656c6935fa84edc40d98cc0a2653763693.zip |
updating icinga
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-analyzer/icinga')
-rw-r--r-- | net-analyzer/icinga/ChangeLog | 8 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.10.0.ebuild (renamed from net-analyzer/icinga/icinga-1.9.1.ebuild) | 4 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.8.4-r1.ebuild | 251 |
3 files changed, 9 insertions, 254 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index f9b7ed379445..4ba2161aa7e9 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.40 2013/07/08 04:27:17 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.41 2013/11/10 23:20:10 prometheanfire Exp $ + +*icinga-1.10.0 (10 Nov 2013) + + 10 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.10.0.ebuild, + -icinga-1.8.4-r1.ebuild, -icinga-1.9.1.ebuild: + updating icinga *icinga-1.9.3 (08 Jul 2013) diff --git a/net-analyzer/icinga/icinga-1.9.1.ebuild b/net-analyzer/icinga/icinga-1.10.0.ebuild index 2ed33e8bbb50..3ad8beb38365 100644 --- a/net-analyzer/icinga/icinga-1.9.1.ebuild +++ b/net-analyzer/icinga/icinga-1.10.0.ebuild @@ -1,8 +1,8 @@ # 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.9.1.ebuild,v 1.1 2013/05/28 08:32:50 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.10.0.ebuild,v 1.1 2013/11/10 23:20:10 prometheanfire Exp $ -EAPI=2 +EAPI=5 inherit depend.apache eutils multilib toolchain-funcs user versionator diff --git a/net-analyzer/icinga/icinga-1.8.4-r1.ebuild b/net-analyzer/icinga/icinga-1.8.4-r1.ebuild deleted file mode 100644 index 01685d90e798..000000000000 --- a/net-analyzer/icinga/icinga-1.8.4-r1.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# 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 -} |