diff options
author | Matthew Thode (prometheanfire) <mthode@mthode.org> | 2011-02-16 17:27:26 +0000 |
---|---|---|
committer | Matthew Thode (prometheanfire) <mthode@mthode.org> | 2011-02-16 17:27:26 +0000 |
commit | 3dc3a81e86f1d6dc5320f6d9fefdb3b6d4216937 (patch) | |
tree | 089e6f93cd4a1c8bb23b7af4a30981626a0f182b /net-analyzer | |
parent | net-analyzer/icinga: Version bump with elog change and var renaming (diff) | |
download | sunrise-3dc3a81e86f1d6dc5320f6d9fefdb3b6d4216937.tar.gz sunrise-3dc3a81e86f1d6dc5320f6d9fefdb3b6d4216937.tar.bz2 sunrise-3dc3a81e86f1d6dc5320f6d9fefdb3b6d4216937.zip |
net-analyzer/icinga: changed order of inherits on 1.3.0 and removed 1.2.1
svn path=/sunrise/; revision=11770
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/icinga/ChangeLog | 4 | ||||
-rw-r--r-- | net-analyzer/icinga/Manifest | 6 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.2.1.ebuild | 214 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.3.0.ebuild | 2 |
4 files changed, 7 insertions, 219 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index 3895bc4a6..3ca9e2a6f 100644 --- a/net-analyzer/icinga/ChangeLog +++ b/net-analyzer/icinga/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Feb 2011; mthode <mthode@mthode.org> -icinga-1.2.1.ebuild, + icinga-1.3.0.ebuild: + changed order of inherits on 1.3.0 and removed 1.2.1 + 16 Feb 2011; mthode <mthode@mthode.org> +icinga-1.3.0.ebuild: Version bump with elog change and var renaming diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index e5f9acc9a..2b4998013 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -4,9 +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.1.tar.gz 8655343 RMD160 1da522144cb1f30ffa2b6f47f3d324d8c736b349 SHA1 730f12808f944bd635d93bb501c55b7360f2ae24 SHA256 88d452db569dc6e32d64571cb3178b79e2ad5378668e3035bf27943edd74650c DIST icinga-1.3.0.tar.gz 12084804 RMD160 2b685c2e5ba6273d917d5b4cb3e22350184b752c SHA1 e6cce4e6d4c86e056e5331900dae8898273dc7e1 SHA256 eec3b6ffcc7bdac7c84d08d6bc8d899ca3ccfd40f063f0fdc0fb5e386ee086f4 -EBUILD icinga-1.2.1.ebuild 5967 RMD160 fd83e47b1a6b6e4c86b55d3b70dad4ba810f5837 SHA1 1f60a55451fa1a1cbffca22857e1971e5c66c096 SHA256 d97715b332ca834ca583df8eb7f2bfe185e0fe8ac3303d0faabb4808e21ca624 -EBUILD icinga-1.3.0.ebuild 5879 RMD160 d3648743060412d57494d41c0e0bb1414c39ef4b SHA1 49f112a242a001514cafaeeb1f3373f6ede783dd SHA256 754eb0abe2af0f8276d19fc26df6ed35c06f175c426cf758d87c6c2f938ed098 -MISC ChangeLog 2470 RMD160 5e6a6bcc65a501091e53e021cfc5864a6658ff21 SHA1 c1108b41d0935bbe1be614497313ab2a762adb7f SHA256 2fe130e263b665bbc132cbce5a3282e0f10597f3f0bb3a970dfc8b623feaa49c +EBUILD icinga-1.3.0.ebuild 5879 RMD160 6a5a465ed0759c089395fde0428e6c7010082efe SHA1 8cf7ad8aff53c301a708f4c923aa6dd01be9b00b SHA256 baaf839d9ee782b54914577cd45ba494fa70df73275eeee7df117f6d100b7e73 +MISC ChangeLog 2613 RMD160 90ad58c956a310b4af90ee2deaf014a25f6caf25 SHA1 7092673618fa4d42859c3bb15a1a7c76887f21f9 SHA256 1a28f015db918a1dc59be889f39bcfcfb5e8a22ccc83b5dd7e30b7b760a9ed58 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e diff --git a/net-analyzer/icinga/icinga-1.2.1.ebuild b/net-analyzer/icinga/icinga-1.2.1.ebuild deleted file mode 100644 index 5491bda52..000000000 --- a/net-analyzer/icinga/icinga-1.2.1.ebuild +++ /dev/null @@ -1,214 +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 multilib 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 )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewuser icinga -1 -1 /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 "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:" - elog " \"-D ICINGA\"" - 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:" - elog " 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 - -} - -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_core - local myconf_common - - myconf_core="$(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" - - myconf_common="--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_common+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf_common+=" --with-command-group=apache" - myconf_core+=" --with-httpd-conf=/etc/apache2/conf.d" - elif use lighttpd ; then - myconf_common+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf_core} ${myconf_common} - if use api ; then - cd module/icinga-api || die - econf ${myconf_common} - 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 - 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 {} + - - keepdir /etc/icinga - keepdir /var/icinga - keepdir /var/icinga/archives - keepdir /var/icinga/rw - keepdir /var/icinga/spool/checkresults - - if use apache2 ; then - webserver=apache - elif use lighttpd ; then - webserver=lighttpd - else - webserver=icinga - fi - 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.3.0.ebuild b/net-analyzer/icinga/icinga-1.3.0.ebuild index 549582a16..706983322 100644 --- a/net-analyzer/icinga/icinga-1.3.0.ebuild +++ b/net-analyzer/icinga/icinga-1.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=2 -inherit depend.apache eutils toolchain-funcs multilib +inherit depend.apache eutils multilib toolchain-funcs DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" HOMEPAGE="http://www.icinga.org/" |