From b0a261ae6e9f013f556629d2c4e0fc615ec394c5 Mon Sep 17 00:00:00 2001 From: "Matthew Thode (prometheanfire)" Date: Mon, 25 Oct 2010 12:55:55 +0000 Subject: net-analyzer/icinga: revbump from 1.2.0-r1 to 1.2.1 -- no ebuild changes svn path=/sunrise/; revision=11481 --- net-analyzer/icinga/ChangeLog | 4 + net-analyzer/icinga/Manifest | 6 +- net-analyzer/icinga/icinga-1.2.0-r1.ebuild | 205 ----------------------------- net-analyzer/icinga/icinga-1.2.1.ebuild | 205 +++++++++++++++++++++++++++++ 4 files changed, 212 insertions(+), 208 deletions(-) delete mode 100644 net-analyzer/icinga/icinga-1.2.0-r1.ebuild create mode 100644 net-analyzer/icinga/icinga-1.2.1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index ad7da2afb..b065f0617 100644 --- a/net-analyzer/icinga/ChangeLog +++ b/net-analyzer/icinga/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Oct 2010; mthode -icinga-1.2.0-r1.ebuild, + +icinga-1.2.1.ebuild: + revbump from 1.2.0-r1 to 1.2.1 -- no ebuild changes + 07 Oct 2010; mthode -icinga-1.2.0.ebuild, +icinga-1.2.0-r1.ebuild: add --with-cgiurl=cgi-bin to configure, contributed by RedPepper diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index 48565116c..306bc83cd 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -4,7 +4,7 @@ AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72 -DIST icinga-1.2.0.tar.gz 8641491 RMD160 9ef229e5bb9b30dfe074cf0339e7ff0ba5c302db SHA1 2168e75dde34a9639de3ff971e3214c7e3213ed1 SHA256 f5bfdcbd4142af27c4df83541b8d03498ccf8da58daa0c91c88b0764a9a73933 -EBUILD icinga-1.2.0-r1.ebuild 5815 RMD160 e5813d34411a9ec600e0ad571fe56e06cbade8e1 SHA1 941d54d6df09983e9e1609ff49697f8d69b23922 SHA256 a2c3c08e05e7c3e901ffa2b3e4664063ea104601443985f686313a2524e618b6 -MISC ChangeLog 1445 RMD160 28355078e8611a384b6286ae60651b67801576aa SHA1 b4dedde229fe631a30ad747695d8de70f26a0be0 SHA256 aefbb033d8ffdc59221fd20596c2afbd201c3f5ad0ce829b37886830e7d454fc +DIST icinga-1.2.1.tar.gz 8655343 RMD160 1da522144cb1f30ffa2b6f47f3d324d8c736b349 SHA1 730f12808f944bd635d93bb501c55b7360f2ae24 SHA256 88d452db569dc6e32d64571cb3178b79e2ad5378668e3035bf27943edd74650c +EBUILD icinga-1.2.1.ebuild 5815 RMD160 e5813d34411a9ec600e0ad571fe56e06cbade8e1 SHA1 941d54d6df09983e9e1609ff49697f8d69b23922 SHA256 a2c3c08e05e7c3e901ffa2b3e4664063ea104601443985f686313a2524e618b6 +MISC ChangeLog 1591 RMD160 fdd32a354b4140c688b2ee99cee392194ddcb436 SHA1 27dcf14965c839945997ae49105b68a0802b6552 SHA256 3343e13f07896b994eb301f5805c87e5dd673e2136f6eaa9e36db2310a60dfbb MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e diff --git a/net-analyzer/icinga/icinga-1.2.0-r1.ebuild b/net-analyzer/icinga/icinga-1.2.0-r1.ebuild deleted file mode 100644 index 8fc671bf2..000000000 --- a/net-analyzer/icinga/icinga-1.2.0-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils depend.apache toolchain-funcs - -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+apache2 api debug +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 dev-lang/php[cgi] ) - apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( net-analyzer/nagios-plugins ) - vim-syntax? ( app-vim/nagios-syntax )" - -want_apache2 - -pkg_setup() { - enewgroup icinga - enewuser icinga -1 /bin/false /var/spool/icinga icinga - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "To have ministatus.cgi requires copying of ministatus.c" - elog "to cgi directory for compiling." - - elog "Note that the user your webserver is running at 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 \"-D ICINGA\"" - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - 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 - -} - -src_prepare() { - if use api ; then - sed -i -e 's/\(USE_ICINGAAPI=\)no/\1yes/g' Makefile.in || die "sed failed in Makefile.in" - fi -} - -src_configure() { - local myconf - - myconf="$(use_enable perl embedded-perl) - $(use_with perl perlcache) - $(use_enable idoutils) - $(use_enable ssl) - $(use_enable debug DEBUG0) - $(use_enable debug DEBUG1) - $(use_enable debug DEBUG2) - $(use_enable debug DEBUG3) - $(use_enable debug DEBUG4) - $(use_enable debug DEBUG5) - --disable-statuswrl - --with-cgiurl=cgi-bin - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/icinga - --sysconfdir=/etc/icinga - --libexecdir=/usr/$(get_libdir)/icinga/plugins" - - if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf+=" --with-command-group=apache --with-httpd-conf=/etc/apache2/conf.d" - elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf} - if use api ; then - cd module/icinga-api - econf ${myconf} - fi -} - -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 - sed -i -e 's/^contactgroups$//g' Makefile || die - - emake DESTDIR="${D}" install{,-config,-commandmode} || die - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils || die - fi - if use api ; then - emake DESTDIR="${D}" install-api || 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 - - fi - - fowners -R icinga:icinga /etc/icinga /var/icinga || die "Failed chown of /etc/icinga" - - fowners -R root:root /usr/$(get_libdir)/icinga - find "${D}"/usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + - find "${D}"/usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + - - keepdir /etc/icinga - keepdir /var/icinga - keepdir /var/icinga/archives - keepdir /var/icinga/rw - keepdir /var/icinga/spool/checkresults - - use apache2 && webserver=apache2 || use lighttpd && webserver=lighttpd || webserver=icinga - fowners -R icinga:${webserver} /var/icinga/rw || die "Failed chown of /var/icinga/rw" - - fperms 6755 /var/icinga/rw || die "Failed Chmod of ${D}/var/icinga/rw" - fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" -} - -pkg_postinst() { - 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." -} diff --git a/net-analyzer/icinga/icinga-1.2.1.ebuild b/net-analyzer/icinga/icinga-1.2.1.ebuild new file mode 100644 index 000000000..8fc671bf2 --- /dev/null +++ b/net-analyzer/icinga/icinga-1.2.1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit eutils depend.apache toolchain-funcs + +DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" +HOMEPAGE="http://www.icinga.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+apache2 api debug +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 dev-lang/php[cgi] ) + apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) + ) + !net-analyzer/nagios-core" +RDEPEND="${DEPEND} + plugins? ( net-analyzer/nagios-plugins ) + vim-syntax? ( app-vim/nagios-syntax )" + +want_apache2 + +pkg_setup() { + enewgroup icinga + enewuser icinga -1 /bin/false /var/spool/icinga icinga + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "To have ministatus.cgi requires copying of ministatus.c" + elog "to cgi directory for compiling." + + elog "Note that the user your webserver is running at 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 \"-D ICINGA\"" + elif use lighttpd ; then + elog " usermod -G icinga lighttpd " + elog "or" + elog " chown icinga:lighttpd /etc/icinga" + 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 + +} + +src_prepare() { + if use api ; then + sed -i -e 's/\(USE_ICINGAAPI=\)no/\1yes/g' Makefile.in || die "sed failed in Makefile.in" + fi +} + +src_configure() { + local myconf + + myconf="$(use_enable perl embedded-perl) + $(use_with perl perlcache) + $(use_enable idoutils) + $(use_enable ssl) + $(use_enable debug DEBUG0) + $(use_enable debug DEBUG1) + $(use_enable debug DEBUG2) + $(use_enable debug DEBUG3) + $(use_enable debug DEBUG4) + $(use_enable debug DEBUG5) + --disable-statuswrl + --with-cgiurl=cgi-bin + --bindir=/usr/sbin + --sbindir=/usr/$(get_libdir)/icinga/cgi-bin + --datarootdir=/usr/share/icinga/htdocs + --localstatedir=/var/icinga + --sysconfdir=/etc/icinga + --libexecdir=/usr/$(get_libdir)/icinga/plugins" + + if use !apache2 && use !lighttpd ; then + myconf+=" --with-command-group=icinga" + else + if use apache2 ; then + myconf+=" --with-command-group=apache --with-httpd-conf=/etc/apache2/conf.d" + elif use lighttpd ; then + myconf+=" --with-command-group=lighttpd" + fi + fi + + econf ${myconf} + if use api ; then + cd module/icinga-api + econf ${myconf} + fi +} + +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 + sed -i -e 's/^contactgroups$//g' Makefile || die + + emake DESTDIR="${D}" install{,-config,-commandmode} || die + + if use idoutils ; then + emake DESTDIR="${D}" install-idoutils || die + fi + if use api ; then + emake DESTDIR="${D}" install-api || 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 + + fi + + fowners -R icinga:icinga /etc/icinga /var/icinga || die "Failed chown of /etc/icinga" + + fowners -R root:root /usr/$(get_libdir)/icinga + find "${D}"/usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + + find "${D}"/usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + + + keepdir /etc/icinga + keepdir /var/icinga + keepdir /var/icinga/archives + keepdir /var/icinga/rw + keepdir /var/icinga/spool/checkresults + + use apache2 && webserver=apache2 || use lighttpd && webserver=lighttpd || webserver=icinga + fowners -R icinga:${webserver} /var/icinga/rw || die "Failed chown of /var/icinga/rw" + + fperms 6755 /var/icinga/rw || die "Failed Chmod of ${D}/var/icinga/rw" + fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga" +} + +pkg_postinst() { + 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." +} -- cgit v1.2.3-65-gdbad