diff options
author | 2010-11-01 14:49:50 +0000 | |
---|---|---|
committer | 2010-11-01 14:49:50 +0000 | |
commit | 64150d1e825a1609958e9d729fccd9886c1ef59b (patch) | |
tree | 106600464e499528b117467d0de1ae1461f67917 /net-analyzer | |
parent | sunrise/ games-strategy: New ebuild for bug #341859 (diff) | |
download | sunrise-reviewed-64150d1e825a1609958e9d729fccd9886c1ef59b.tar.gz sunrise-reviewed-64150d1e825a1609958e9d729fccd9886c1ef59b.tar.bz2 sunrise-reviewed-64150d1e825a1609958e9d729fccd9886c1ef59b.zip |
net-analyzer/icinga: prometheanfire: elog cleanup and variable renaming, along with stuff from bug 271339 from comment 46 to 63
svn path=/sunrise/; revision=11506
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/icinga/ChangeLog | 4 | ||||
-rw-r--r-- | net-analyzer/icinga/Manifest | 5 | ||||
-rw-r--r-- | net-analyzer/icinga/icinga-1.2.1.ebuild | 41 | ||||
-rw-r--r-- | net-analyzer/icinga/wgetpaste | 51 |
4 files changed, 27 insertions, 74 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index 4ece48b4e..2a7b24101 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: $ + 01 Nov 2010; mthode <mthode@mthode.org> icinga-1.2.1.ebuild, -wgetpaste: + prometheanfire: elog cleanup and variable renaming, along with stuff from + bug 271339 from comment 46 to 63 + 30 Oct 2010; mthode <mthode@mthode.org> icinga-1.2.1.ebuild: fixed small fixups diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index 5395cb5c2..511d8129d 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -5,7 +5,6 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 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 -EBUILD icinga-1.2.1.ebuild 5929 RMD160 69a47d14e152dd4c69413033f1e82e759907cb06 SHA1 82a6fa3576b6400b98470491ca0c1c0af560a0d7 SHA256 13a11086c47095bdb83a3c9dec1d0f820537859fdac509d56114af6edee553eb -MISC ChangeLog 2047 RMD160 0e8b73e7603c2f65a6285b8617c80c99fbd8c4a3 SHA1 00ef0d8d27ea0b2182ffcf20111fdc901ed43d3d SHA256 d30d82c8e099cc5e18cd4c8a666a00c81410fe3e92ab0bb470e3279a5e9288a5 +EBUILD icinga-1.2.1.ebuild 5968 RMD160 540ebd8a89f847e7f2b440d33b5da7d74b4e5bdc SHA1 ceb888583bdeabcdee00604e1b7a6d474eead433 SHA256 a34f63c2186975e2e54787340a008c964f21bf31a236ae7c6a44ed165c83b052 +MISC ChangeLog 2234 RMD160 13d22fbbdfef7f904e9401839be45ef8b3b13c2f SHA1 df69218e2d2dc7ba10a8eb50373b9c15b339f643 SHA256 e0c4db1d79ec67423c48b13b6f081dca76edd3fa018d1d4eaae0bac82f1bd99a MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e -MISC wgetpaste 2951 RMD160 b617cb45aa071ac7b30d8bf4bb0e06bcab71ee89 SHA1 cea2ddf1785307489286c2203962ed82dd75cca5 SHA256 83ef085397db417db58a4ee8b471788ed9455090ed5445b4c189f29c03a26898 diff --git a/net-analyzer/icinga/icinga-1.2.1.ebuild b/net-analyzer/icinga/icinga-1.2.1.ebuild index 4c21479b8..f4599afba 100644 --- a/net-analyzer/icinga/icinga-1.2.1.ebuild +++ b/net-analyzer/icinga/icinga-1.2.1.ebuild @@ -4,7 +4,7 @@ EAPI=2 -inherit eutils depend.apache toolchain-funcs +inherit eutils depend.apache multilib toolchain-funcs DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" HOMEPAGE="http://www.icinga.org/" @@ -24,24 +24,20 @@ DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) ) !net-analyzer/nagios-core" RDEPEND="${DEPEND} - plugins? ( net-analyzer/nagios-plugins ) - vim-syntax? ( app-vim/nagios-syntax )" + 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 "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 "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:" @@ -51,12 +47,14 @@ pkg_setup() { elog "or" elog " chown icinga:apache /etc/icinga" elog - elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\"" + 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 'include \"lighttpd_icinga.conf\"'" + 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" @@ -82,9 +80,10 @@ src_prepare() { } src_configure() { - local myconf + local myconf_core + local myconf_common - myconf="$(use_enable perl embedded-perl) + myconf_core="$(use_enable perl embedded-perl) $(use_with perl perlcache) $(use_enable idoutils) $(use_enable ssl) @@ -95,8 +94,9 @@ src_configure() { $(use_enable debug DEBUG4) $(use_enable debug DEBUG5) --disable-statuswrl - --with-cgiurl=cgi-bin - --bindir=/usr/sbin + --with-cgiurl=/cgi-bin" + + myconf_common="--bindir=/usr/sbin --sbindir=/usr/$(get_libdir)/icinga/cgi-bin --datarootdir=/usr/share/icinga/htdocs --localstatedir=/var/icinga @@ -104,19 +104,20 @@ src_configure() { --libexecdir=/usr/$(get_libdir)/icinga/plugins" if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" + myconf_common+=" --with-command-group=icinga" else if use apache2 ; then - myconf+=" --with-command-group=apache --with-httpd-conf=/etc/apache2/conf.d" + myconf_common+=" --with-command-group=apache" + myconf_core+=" --with-httpd-conf=/etc/apache2/conf.d" elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" + myconf_common+=" --with-command-group=lighttpd" fi fi - econf ${myconf} + econf ${myconf_core} ${myconf_common} if use api ; then - cd module/icinga-api - econf ${myconf} + cd module/icinga-api || die + econf ${myconf_common} fi } diff --git a/net-analyzer/icinga/wgetpaste b/net-analyzer/icinga/wgetpaste deleted file mode 100644 index 475cbb2bd..000000000 --- a/net-analyzer/icinga/wgetpaste +++ /dev/null @@ -1,51 +0,0 @@ -Index: Manifest -=================================================================== ---- Manifest (revision 11496) -+++ Manifest (working copy) -@@ -5,6 +5,6 @@ - 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 --EBUILD icinga-1.2.1.ebuild 5807 RMD160 be7837b18bf04c8112af1831e1b84cad5e4eb6d0 SHA1 2618495d362c6099ea2c6b6ea8950ffb89fec5d1 SHA256 07fafbd56d01bd95c3b99dd3f4384513c3ce7f66bac6fefa857ab0354b0ee10b -+EBUILD icinga-1.2.1.ebuild 5931 RMD160 ae683e1d49da618672d47534459fb15bb0fb475f SHA1 ead9b4fde87032db282b149e0a38e1b90e0b4130 SHA256 49adcdca91b4d5e13a96e7ae5df0c6e423ba9ecbd9a107fc0cd293da3dac3410 - MISC ChangeLog 1780 RMD160 4ac8c0afa7d97d564f18a6935b3b1e0cd8dcaec3 SHA1 4f61ee9a085667c39807a5102dd00e439345653f SHA256 c3289bd7e0f338ba44fae7117bd559e3f04f0068ae58b685d5fa69ab9ab68735 - MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e -Index: icinga-1.2.1.ebuild -=================================================================== ---- icinga-1.2.1.ebuild (revision 11496) -+++ icinga-1.2.1.ebuild (working copy) -@@ -56,6 +56,7 @@ - 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" -@@ -177,8 +178,9 @@ - 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 {} + -+ 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 -@@ -186,7 +188,13 @@ - keepdir /var/icinga/rw - keepdir /var/icinga/spool/checkresults - -- use apache2 && webserver=apache2 || use lighttpd && webserver=lighttpd || webserver=icinga -+ 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" |