[gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-11-25 17:59 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-11-25 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7dc7eb44ba119d2c337316392a374e58ada67f84
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 16:47:37 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 16:47:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=7dc7eb44

removed need for sed (more configure options)

---
 net-analyzer/icinga/Manifest                 |    2 ++
 net-analyzer/icinga/icinga-1.6.0_beta.ebuild |    8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index daa0bbd..22007e1 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,6 +6,8 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
+DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
+EBUILD icinga-1.6.0_beta.ebuild 6909 RMD160 472c3d000dd18ad3eb81beedfc1b33a279520f4e SHA1 63568b272817c827f7385bf6f77473aca0802094 SHA256 088158a13f5772bea4bebaf05d1cfced7f277a16bb5b052b05ccc90a43c9bfc1
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
index 0a9fe6f..28d26d8 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -109,7 +109,9 @@ src_configure() {
 	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
 	--datarootdir=/usr/share/icinga/htdocs
 	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga"
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga"
 
 	if use plugins ; then
 		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
@@ -156,8 +158,8 @@ src_install() {
 
 	emake DESTDIR="${D}" install{,-config,-commandmode} || die
 
-	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
-	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+#	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
+#	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
 
 	if use idoutils ; then
 		 emake DESTDIR="${D}" install-idoutils || die



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-11-25 17:59 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-11-25 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     e4edee847e2f35cbf4c448b853b0941a00a1119c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 16:35:13 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 16:35:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=e4edee84

First beta of 1.6

---
 net-analyzer/icinga/icinga-1.6.0_beta.ebuild |  229 ++++++++++++++++++++++++++
 1 files changed, 229 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
new file mode 100644
index 0000000..0a9fe6f
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.5.1-r3.ebuild,v 1.2 2011/11/22 21:06:50 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+MY_P="${PN}-$(replace_version_separator 3 '')"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 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
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
+	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 \"-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"
+			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
+
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+}
+
+src_configure() {
+	local myconf
+	local myconf2
+
+	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=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga"
+
+	myconf2="--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga"
+
+	if use plugins ; then
+		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf2+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf2+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf2+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} ${myconf2}
+}
+
+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
+
+	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
+	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d-2 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 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 {} +
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	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() {
+	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
+	elog "/var/icinga was moved to /var/lib/icinga"
+	elog "please move the file if this was an upgrade"
+}



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-11-25 19:33 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-11-25 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     61ab0a1780154b04e349b0fbc1005dfc7275c7c4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 19:32:46 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 19:32:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=61ab0a17

added elog for changing ido2db location

---
 net-analyzer/icinga/Manifest                 |    2 +-
 net-analyzer/icinga/icinga-1.6.0_beta.ebuild |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index da69afe..98b7193 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,6 +8,6 @@ AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf0
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.0_beta.ebuild 6706 RMD160 1be879859e6d00af4adcc1593e1fa044a4339f25 SHA1 1bd0ef938df310ff120ccf8f5f585452744867a4 SHA256 8438a0cfec694ca926e3a097611144333aed7d9252cae20f9f98ff23b81c5410
+EBUILD icinga-1.6.0_beta.ebuild 6907 RMD160 aa46ca73d3b57e29b74fdabce3494f683b63b01d SHA1 0d9dc5f5d98bf3229edb24a3761329569135c6a6 SHA256 0a5aac96878e648df930bb3f54332b2559163e898435524a7cbc89f42bfbcac6
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
index 3419911..0b89bea 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -222,5 +222,11 @@ pkg_postinst() {
 	elog "the group wheel, but this is not recomended."
 	elog
 	elog "/var/icinga was moved to /var/lib/icinga"
-	elog "please move the file if this was an upgrade"
+	elog "please move the files if this was an upgrade"
+	if use idoutils ; then
+		elog
+		elog "The location of icinga's files has changed to /var/lib/icinga"
+		elog "please edit /etc/ido2db.cfg to change the location of the files"
+		elog "it accesses"
+	fi
 }



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-11-26 19:43 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-11-26 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     1816499d0ed405271284115d6f5af43dd18a0bfd
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 19:43:14 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 19:43:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=1816499d

changed elog location for the web stuff

---
 net-analyzer/icinga/icinga-1.6.0_beta.ebuild |   85 +++++++++++++-------------
 1 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
index 0b89bea..a10a613 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -38,49 +38,6 @@ pkg_setup() {
 	enewgroup icinga
 	enewgroup nagios
 	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
-	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 \"-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"
-			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
-
 }
 
 src_prepare() {
@@ -212,6 +169,48 @@ src_install() {
 }
 
 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 \"-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"
+			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"



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-11-26 19:44 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-11-26 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     8c1a8a39c8161d3cd983290d0939a12ff42bcd91
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 19:43:58 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 19:43:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8c1a8a39

forgot manifest

---
 net-analyzer/icinga/Manifest |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 98b7193..db8ef77 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,6 +8,6 @@ AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf0
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.0_beta.ebuild 6907 RMD160 aa46ca73d3b57e29b74fdabce3494f683b63b01d SHA1 0d9dc5f5d98bf3229edb24a3761329569135c6a6 SHA256 0a5aac96878e648df930bb3f54332b2559163e898435524a7cbc89f42bfbcac6
+EBUILD icinga-1.6.0_beta.ebuild 6911 RMD160 c7eb95e4fd64b6f4078b1dff310c9487559b073a SHA1 f2c0134deb803b9b52a6244a2ee8e1f20af934ed SHA256 a7581dddac4aaf7f68983e86c4030c043f5a3f23f402a19a04b7add3755dfef8
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-12-02 21:03 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-12-02 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     44916d7d985b57a2caf3d59eae4bafe44ac032af
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 21:03:20 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 21:03:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=44916d7d

updated for release

---
 net-analyzer/icinga/Manifest                       |    4 +-
 ...cinga-1.6.0_beta.ebuild => icinga-1.6.1.ebuild} |   23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index db8ef77..ddd436d 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,8 +6,8 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
-DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
+DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.0_beta.ebuild 6911 RMD160 c7eb95e4fd64b6f4078b1dff310c9487559b073a SHA1 f2c0134deb803b9b52a6244a2ee8e1f20af934ed SHA256 a7581dddac4aaf7f68983e86c4030c043f5a3f23f402a19a04b7add3755dfef8
+EBUILD icinga-1.6.1.ebuild 7092 RMD160 a1d45376e4e313bbf9c11280802e1920b39c6b6e SHA1 a283bbdd86392740a52e1e4371448bb49c59f8db SHA256 50ed4c88014bc13e0853466ead9b57bbde74c66791dbcaf2571402045dcc27e5
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.1.ebuild
similarity index 91%
rename from net-analyzer/icinga/icinga-1.6.0_beta.ebuild
rename to net-analyzer/icinga/icinga-1.6.1.ebuild
index a10a613..fd90315 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1.ebuild
@@ -14,7 +14,6 @@ MY_P="${PN}-$(replace_version_separator 3 '')"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -184,9 +183,10 @@ pkg_postinst() {
 				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 a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
 				elog
-				elog "Icinga web service needs user	authentication. If you"
+				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:"
@@ -220,12 +220,15 @@ pkg_postinst() {
 	elog "filesystem. You can fix this by adding icinga into"
 	elog "the group wheel, but this is not recomended."
 	elog
-	elog "/var/icinga was moved to /var/lib/icinga"
-	elog "please move the files if this was an upgrade"
-	if use idoutils ; then
-		elog
-		elog "The location of icinga's files has changed to /var/lib/icinga"
-		elog "please edit /etc/ido2db.cfg to change the location of the files"
-		elog "it accesses"
+	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"
+		fi
+		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
 }



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-12-03  8:31 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-12-03  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     4369e2cdb32a803e8a1881bd04beb089135c110f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 08:31:28 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 08:31:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=4369e2cd

Fixed elog

---
 net-analyzer/icinga/icinga-1.6.1.ebuild |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/icinga/icinga-1.6.1.ebuild b/net-analyzer/icinga/icinga-1.6.1.ebuild
index fd90315..88a675b 100644
--- a/net-analyzer/icinga/icinga-1.6.1.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.5.1-r3.ebuild,v 1.2 2011/11/22 21:06:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1.ebuild,v 1.1 2011/12/02 22:09:06 prometheanfire Exp $
 
 EAPI=2
 
-inherit depend.apache eutils multilib toolchain-funcs versionator
+inherit depend.apache eutils multilib toolchain-funcs
 
 DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
 HOMEPAGE="http://www.icinga.org/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-MY_P="${PN}-$(replace_version_separator 3 '')"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -228,7 +224,8 @@ pkg_postinst() {
 			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
 			ewarn "it accesses"
 		fi
-		ewarn "the \"mv /var/icinga /var/lib/\" command works well to move the files"
+		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
 }



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2011-12-03  8:32 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2011-12-03  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     99ce18b81be6c5dc13069db2c8c5b2f3b3d9ec24
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 08:32:17 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 08:32:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=99ce18b8

forgot manifest

---
 net-analyzer/icinga/Manifest |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ddd436d..ac06641 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,6 +8,6 @@ AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf0
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.1.ebuild 7092 RMD160 a1d45376e4e313bbf9c11280802e1920b39c6b6e SHA1 a283bbdd86392740a52e1e4371448bb49c59f8db SHA256 50ed4c88014bc13e0853466ead9b57bbde74c66791dbcaf2571402045dcc27e5
+EBUILD icinga-1.6.1.ebuild 6963 RMD160 a18fc79282f187a14f7eb40caee44bbf7f02c601 SHA1 a9c071619cfb8e7990aa203881ccd4d3fb0d4f5e SHA256 35437f349927e334cab3a824072dd93edbf6721ebd48091d4c38c613e92d93d3
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-02-27  4:10 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-02-27  4:10 UTC (permalink / raw
  To: gentoo-commits

commit:     fa4af4e332ac14404297401fc3cca08cf73ccdd2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 04:10:25 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 04:10:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=fa4af4e3

first test of readding the API (statically)

---
 net-analyzer/icinga/ChangeLog              |    5 +
 net-analyzer/icinga/Manifest               |    3 +-
 net-analyzer/icinga/icinga-1.6.1-r3.ebuild |  235 ++++++++++++++++++++++++++++
 3 files changed, 242 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 9a69915..e3fb007 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.5 2011/11/22 19:53:37 prometheanfire Exp $
 
+*icinga-1.6.1-r3 (27 Feb 2012)
+
+  27 Feb 2012; mthode <mthode@gentoo.org> +icinga-1.6.1-r3.ebuild:
+  adding API back into the build (should have been statically in it)
+
   12 Jan 2012; mthode <mthode@gentoo.org> files/icinga-init.d-2:
   fixed initscript reload reload
 

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index a339146..b573862 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,6 +8,7 @@ AUX ido2db-init.d 990 RMD160 505b54e4ca4cc7ce4771680837a937c0416d9394 SHA1 a2e73
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
+EBUILD icinga-1.6.1-r3.ebuild 7056 RMD160 d06e230ec69c3bd0df5c8d4d8088334ff09008c7 SHA1 1ee629636a6a25216340437c9adb9707a7aefa9c SHA256 16a2096e32c800f5107333ba6cc719ccc5ab06877a5b7d13ee0f046ef8383374
 EBUILD icinga-1.6.1.ebuild 6963 RMD160 a18fc79282f187a14f7eb40caee44bbf7f02c601 SHA1 a9c071619cfb8e7990aa203881ccd4d3fb0d4f5e SHA256 35437f349927e334cab3a824072dd93edbf6721ebd48091d4c38c613e92d93d3
-MISC ChangeLog 1362 RMD160 ccdcbf450ebec3d8f4d9c094f3ca7f7ea97aa4cb SHA1 6dc9074a6656350d3e978b5527395d6208fa1e2f SHA256 48bb0a8b9ec3732dc21ea7478b4df6f4442db5a49771e2ea86f394c3ad38e4cd
+MISC ChangeLog 1531 RMD160 92a982a934275a38a0e8b559dab10de35e2d25bb SHA1 de93dbf1e18dfee1b00c47b23e3d68f3c078a72a SHA256 d4921b473368eb142816442114347176b410823974e180e3ab7c0660ee8e3f29
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/icinga-1.6.1-r3.ebuild b/net-analyzer/icinga/icinga-1.6.1-r3.ebuild
new file mode 100644
index 0000000..3ae74dc
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.6.1-r3.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r2.ebuild,v 1.1 2011/12/29 15:54:57 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils 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 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
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+}
+
+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=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--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"
+
+	if use plugins ; then
+		myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/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}
+
+	cd module/icinga-api || die
+	econf ${myconf2}
+}
+
+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
+
+	sed -i -e 's/var\/lib\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+	emake DESTDIR="${D}" install-api || die
+
+	newinitd "${FILESDIR}"/icinga-init.d-2 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 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 {} +
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	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"
+			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"
+		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
+}



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-02-27 21:20 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-02-27 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     8dfe1667075679f092a52a6566690385a1c50430
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 21:19:50 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 21:19:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8dfe1667

api should still be removed...

---
 net-analyzer/icinga/icinga-1.6.1-r3.ebuild |  235 ----------------------------
 1 files changed, 0 insertions(+), 235 deletions(-)

diff --git a/net-analyzer/icinga/icinga-1.6.1-r3.ebuild b/net-analyzer/icinga/icinga-1.6.1-r3.ebuild
deleted file mode 100644
index 3ae74dc..0000000
--- a/net-analyzer/icinga/icinga-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r2.ebuild,v 1.1 2011/12/29 15:54:57 prometheanfire Exp $
-
-EAPI=2
-
-inherit depend.apache eutils 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 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
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
-}
-
-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=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga
-	--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"
-
-	if use plugins ; then
-		myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/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}
-
-	cd module/icinga-api || die
-	econf ${myconf2}
-}
-
-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
-
-	sed -i -e 's/var\/lib\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-	emake DESTDIR="${D}" install-api || die
-
-	newinitd "${FILESDIR}"/icinga-init.d-2 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 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 {} +
-	dodir /var/run/icinga || die
-	fowners icinga:icinga /var/run/icinga || die
-
-	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"
-			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"
-		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
-}



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-05-14 18:22 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-05-14 18:22 UTC (permalink / raw
  To: gentoo-commits

commit:     b55a760e364ca65fdf7d592cfeda6022759e3427
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:22:12 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:22:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=b55a760e

oops

---
 net-analyzer/icinga/Manifest |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index a847ed8..5c2c001 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,3 +1,4 @@
+AUX fix-prestripped-binaries-1.7.0.patch 775 RMD160 296c6b7e05a18471fbc3ebb5feb028dadd26a068 SHA1 9173a24e36c1d1fa1a381410a9b6a426d887499b SHA256 3baec839badaf8bc1baf8ead781c39358777378c112926900a9b30b5358b1fdd
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
@@ -10,6 +11,6 @@ DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc
 DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
 EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
 EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 d75ffeb9562007091ac342e106e45154e10527b1 SHA1 2198bc9c8e17b3ff35a0503ecee059c13dec1b12 SHA256 097a3a082bdbb8f0264131445608130465ed7d2ecad1e35d4433022d12c22683
-EBUILD icinga-1.7.0_beta1.ebuild 7603 RMD160 9392855250076bf86b97db7d0e12059e119bec07 SHA1 b5b8079a650781a50be47921885f4e3a5347187f SHA256 52dbc68d937221093b0c9bd346f94748c8aab2128295b1a1b6e4212804ba1f93
+EBUILD icinga-1.7.0_beta1.ebuild 7609 RMD160 6bbb5906be9352be5457378053e117cd51393e83 SHA1 492fe1758009017947da0c608fa30a8923de6d58 SHA256 969ff30909f3f7aedaccfb96a7c0252d300ca567a0c7f465b26e69171a1efb1a
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-05-14 18:52 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-05-14 18:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4e7b99304f4a137d82013b6ac4708aafaf3c144a
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:52:07 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:52:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=4e7b9930

fix?

---
 net-analyzer/icinga/Manifest                  |    2 +-
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 1c98f0d..6ae12a7 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,6 +10,6 @@ DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc
 DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
 EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
 EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
-EBUILD icinga-1.7.0_beta1.ebuild 7607 RMD160 963c5cdedb7f914bb56116c1a47d88cf3ee3f659 SHA1 65fdcce64ec3796baddb1c30028a57010b325021 SHA256 3e7f4f78d567a6431d476ec383b7e7b6e0fe1c52da949c337db9d40a61774917
+EBUILD icinga-1.7.0_beta1.ebuild 7557 RMD160 17778e6df8262c96426177c8c2034b66991ff74f SHA1 ee29fff7f2278b712242f1a7f6d51bdbbb2778de SHA256 ee539892997d9a5c5faefaef024b8d5bc4977e2e16ab417c4c1634bef4c038a9
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 15ef04a..88b21a5 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=2
 
-inherit depend.apache eutils multilib toolchain-funcs
+inherit depend.apache eutils multilib toolchain-funcs versionator
 
 DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
 HOMEPAGE="http://www.icinga.org/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="http://superb-dca2.dl.sourceforge.net/project/icinga/icinga/1.7.0beta/icinga-1.7.0beta1.tar.gz"
+MY_P=$(delete_version_separator 3)
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-05-14 19:11 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-05-14 19:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e98cb578966569e6f98f01606fdde0f66bb039f4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 19:10:38 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 19:10:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=e98cb578

more versionator stuff

---
 net-analyzer/icinga/Manifest                  |    2 +-
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 89bf91e..ce51d2a 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,6 +10,6 @@ DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc
 DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
 EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
 EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
-EBUILD icinga-1.7.0_beta1.ebuild 7557 RMD160 17778e6df8262c96426177c8c2034b66991ff74f SHA1 ee29fff7f2278b712242f1a7f6d51bdbbb2778de SHA256 ee539892997d9a5c5faefaef024b8d5bc4977e2e16ab417c4c1634bef4c038a9
+EBUILD icinga-1.7.0_beta1.ebuild 7587 RMD160 9be61fdeff85d6b6c360515edfc430f06326f5a2 SHA1 6ee0a089c4e915c457dab1f7ccd912c041165276 SHA256 6054dcb8e320213d10d6e2ca4c14d9d5410e9a572f00c8e7051b0b31b8f23314
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 88b21a5..4bd89ff 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -8,8 +8,9 @@ inherit depend.apache eutils multilib toolchain-funcs versionator
 
 DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
 HOMEPAGE="http://www.icinga.org/"
-MY_P=$(delete_version_separator 3)
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_P}.tar.gz"
+MY_PV=$(delete_version_separator 3)
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_PV}
 
 LICENSE="GPL-2"
 SLOT="0"



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-05-15 20:14 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-05-15 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     aaf705225a0ada92de68344aa9af641ae9e927d7
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue May 15 20:13:54 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue May 15 20:13:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=aaf70522

removed the beta :D

---
 net-analyzer/icinga/Manifest                       |    4 ++--
 ...inga-1.7.0_beta1.ebuild => icinga-1.7.0.ebuild} |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ce51d2a..b6f1cc6 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -7,9 +7,9 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
-DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
+DIST icinga-1.7.0.tar.gz 12939198 RMD160 465edafc080c1674e17daf24a2ce8dabc203dae7 SHA1 3cf1bd7957166a44b1fc106082d1a04bbfa1799e SHA256 e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b
 EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
 EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
-EBUILD icinga-1.7.0_beta1.ebuild 7587 RMD160 9be61fdeff85d6b6c360515edfc430f06326f5a2 SHA1 6ee0a089c4e915c457dab1f7ccd912c041165276 SHA256 6054dcb8e320213d10d6e2ca4c14d9d5410e9a572f00c8e7051b0b31b8f23314
+EBUILD icinga-1.7.0.ebuild 7639 RMD160 37b1d4e0f96022a6853b2eba506dda130b366540 SHA1 6bb25ac0f4857c039679e85cfb2c7032bc5be408 SHA256 10de46edb91495fdf7f9cfb9595f761af9bb4a756439b761c58a9f98d1ff4cea
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0.ebuild
similarity index 97%
rename from net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
rename to net-analyzer/icinga/icinga-1.7.0.ebuild
index 4bd89ff..bdc227d 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0.ebuild
@@ -8,9 +8,10 @@ inherit depend.apache eutils multilib toolchain-funcs 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}
+#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"



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-10-23  2:40 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-10-23  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     964eceac0f03fa2c66920aa0cf5a3f38424b4772
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 02:39:48 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 02:39:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=964eceac

initial add for testing

---
 net-analyzer/icinga/Manifest            |   22 +---
 net-analyzer/icinga/icinga-1.8.0.ebuild |  248 +++++++++++++++++++++++++++++++
 2 files changed, 250 insertions(+), 20 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index a89539f..3f340e1 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
 AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f
 AUX icinga-apache.conf 591 SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df SHA512 f08d6d17fcbd695af43a6e2ca230c001ad5ab2ce4f50c61ed8a41addb1eebc7a6fbbb0a53d72ba5686d5a8d0f21d9a2e9cff98e8ce53e8bd04d9a658300d327a WHIRLPOOL 5b93d216745a5aee353aa03e5054926bf6e0ef8929ce17b174672787254a4b3c9707a3d718ca75619d03436818543434c621f8e97f9914bef616dba2ddc093d1
@@ -10,23 +7,8 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172db0197ca8123d2 SHA512 c5c6f3245f61bb5deb49438255215624c3286a73dfe6c7ef7f69fb60e497163c2d7766cc6fa14acbbc20505bc278a59afd946a95189d3b952ed817c98b93fd53 WHIRLPOOL f271ad1ad9a7b541420654d2c96f2ac61f0acb484963ac27892a0dbd1889789c721e23313f6f2b4787336531c63b3cd7715e53a19f5ad6f1ff29fba128d5a4bc
 DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
+DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f
 EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
+EBUILD icinga-1.8.0.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
 MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQV3+9AAoJECRx6z5ArFrDDOYP/j2U3zri7Fj4eixwOfOR5ChJ
-1c6Sa72xUXly1lDt5NskeIR9+BxWEHT8vGpIg8MjBKe4auTJ6cz+j5exkE27zibW
-mrxbHTTSlDyZ9hpZX6LM7IOcu9xTAHNdgnE9OpK9dcqmz4FqhMKUqZHj6vsA9GXX
-ZEOXtdq84StBU7XDwO7/aJ4D1ZK0J/sOpf8kWTF/eKkcYAxW59QFhyK8/vKbEKTj
-YGYl4FFFKyf4fcDXm6HkkB7XmTSDoEe81B/+D665gDP8bTbxi3AghGzTLdoDzrpv
-1z2QLdDdXFzxu9Lg+2OE/51GKDeU018w1XIqZ584kIc0wu/EPNnBA7pnoMaRkDqG
-etaZAlMZwJ1KDrWo5XXMyYLlE2S6nA2BvoJansLsIjN2+Z2MxB7O+n0nykEgYAcD
-do8GaNvSkuysBbQJW2ePBhBDAB1onyCGTXoqFYloRQujXJh3CGV8RENYTp0HDkSd
-hF9rphmUyjgYZ29jyjOTILfnMpbzUfvERTIoWkUiHDBJmAJrJGcqxA0j0Dl+4QEX
-3OAZv8zyzPvv8JBkbskLJTAaLDVDnkgUCn+rHyuD+EHGRhCx9xsZnklUqYM8TEAB
-36tSbGsDPkpq4lk3V659H+FpOUzWGEvqY/pa3wA8mCFaOwpXpZRGD2f07NNCNpoH
-XAHmqSybBfq7OLYs8vTW
-=zSwD
------END PGP SIGNATURE-----

diff --git a/net-analyzer/icinga/icinga-1.8.0.ebuild b/net-analyzer/icinga/icinga-1.8.0.ebuild
new file mode 100644
index 0000000..55c979b
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.0.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.2.ebuild,v 1.4 2012/09/17 19:48:49 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 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
+
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	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"
+			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"
+		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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-10-23  3:45 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-10-23  3:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8ac317f75794ab410b4dead9f38403c008553ede
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 03:44:48 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 03:44:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8ac317f7

updated instructions for idoutils updating

---
 net-analyzer/icinga/Manifest            |    2 +-
 net-analyzer/icinga/icinga-1.8.0.ebuild |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 3f340e1..ccfd158 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -9,6 +9,6 @@ AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172d
 DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
 DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f
 EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
-EBUILD icinga-1.8.0.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
+EBUILD icinga-1.8.0.ebuild 7515 SHA256 e1a9bb61334f865b950816aa4329664186cce4226b4c1a66e6069b0ddb038483 SHA512 ed3884c1cd650aee9eb441a927b064e7cb3c9fe3addf3774e95d3ba1a8b3a9b41fb3a8bf58c00a3bf3cb2019e8620ea6745995e643f42f24bbadcc75b343a193 WHIRLPOOL aa25c54a4786e6ad390fa90f807d9926388eb4c8c271226fbd48a157dc59dde79fcdef9fcedf2c0a4a6f6d2b1c0f4b2f546b2995a4b9fda08e5ee159d42c704e
 MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86

diff --git a/net-analyzer/icinga/icinga-1.8.0.ebuild b/net-analyzer/icinga/icinga-1.8.0.ebuild
index 55c979b..fe83f26 100644
--- a/net-analyzer/icinga/icinga-1.8.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.8.0.ebuild
@@ -240,6 +240,8 @@ pkg_postinst() {
 		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"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-10-25  4:32 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-10-25  4:32 UTC (permalink / raw
  To: gentoo-commits

commit:     02cae96e20b38a35f9ba70d6c59cc43f4e99c27b
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Thu Oct 25 04:33:03 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 04:33:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=02cae96e

1.8.1

---
 net-analyzer/icinga/Manifest            |    2 +
 net-analyzer/icinga/icinga-1.8.1.ebuild |  250 +++++++++++++++++++++++++++++++
 2 files changed, 252 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ccfd158..de0f244 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -8,7 +8,9 @@ AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62
 AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172db0197ca8123d2 SHA512 c5c6f3245f61bb5deb49438255215624c3286a73dfe6c7ef7f69fb60e497163c2d7766cc6fa14acbbc20505bc278a59afd946a95189d3b952ed817c98b93fd53 WHIRLPOOL f271ad1ad9a7b541420654d2c96f2ac61f0acb484963ac27892a0dbd1889789c721e23313f6f2b4787336531c63b3cd7715e53a19f5ad6f1ff29fba128d5a4bc
 DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
 DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f
+DIST icinga-1.8.1.tar.gz 7543668 SHA256 3d02d80bdefc2518ab8517be6930a518b77747e0243fa594731fb1f95dbab916 SHA512 2a0d0c68c6f039e38281ac59ef4145997728bfbd5c869f89cb329a9fc522db0315bc31c629ce2c04b58a7a980675ade5dd06d461ee4c904f0002b101377c9af0 WHIRLPOOL fc3282200a076ae6da3ae7f615c8a5b35abd38e65c86fb9763c974d128294457830f78fc157b792c7ec46d54250fae9a2432556ea489e9d3ab6a35879a32eac8
 EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
 EBUILD icinga-1.8.0.ebuild 7515 SHA256 e1a9bb61334f865b950816aa4329664186cce4226b4c1a66e6069b0ddb038483 SHA512 ed3884c1cd650aee9eb441a927b064e7cb3c9fe3addf3774e95d3ba1a8b3a9b41fb3a8bf58c00a3bf3cb2019e8620ea6745995e643f42f24bbadcc75b343a193 WHIRLPOOL aa25c54a4786e6ad390fa90f807d9926388eb4c8c271226fbd48a157dc59dde79fcdef9fcedf2c0a4a6f6d2b1c0f4b2f546b2995a4b9fda08e5ee159d42c704e
+EBUILD icinga-1.8.1.ebuild 7515 SHA256 e1a9bb61334f865b950816aa4329664186cce4226b4c1a66e6069b0ddb038483 SHA512 ed3884c1cd650aee9eb441a927b064e7cb3c9fe3addf3774e95d3ba1a8b3a9b41fb3a8bf58c00a3bf3cb2019e8620ea6745995e643f42f24bbadcc75b343a193 WHIRLPOOL aa25c54a4786e6ad390fa90f807d9926388eb4c8c271226fbd48a157dc59dde79fcdef9fcedf2c0a4a6f6d2b1c0f4b2f546b2995a4b9fda08e5ee159d42c704e
 MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86

diff --git a/net-analyzer/icinga/icinga-1.8.1.ebuild b/net-analyzer/icinga/icinga-1.8.1.ebuild
new file mode 100644
index 0000000..fe83f26
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.2.ebuild,v 1.4 2012/09/17 19:48:49 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 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
+
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	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"
+			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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/
@ 2012-12-06  4:13 Matt Thode
  0 siblings, 0 replies; 18+ messages in thread
From: Matt Thode @ 2012-12-06  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     4da517a11a21d8acecdab2f2b0f04c2747fcc1ae
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Thu Dec  6 04:14:01 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 04:14:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=4da517a1

icinga-1.8.2 initial commit for testing

---
 net-analyzer/icinga/Manifest            |    2 +
 net-analyzer/icinga/icinga-1.8.2.ebuild |  250 +++++++++++++++++++++++++++++++
 2 files changed, 252 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index de0f244..a5e48a7 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -9,8 +9,10 @@ AUX ido2db-init.d 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172d
 DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
 DIST icinga-1.8.0.tar.gz 7543267 SHA256 0ebc89f7c7beda727804f8a78ee07cf747281fa9e479f5d8f152f6f9b3af0fb8 SHA512 75561bda625c461f469c3d97f8edf6bade111a956241fc20b15909652432eb4a28027733a1ae18890d73d44319403771ede3ba972ac32ce08b984d5f2a2070c8 WHIRLPOOL c02f8836d916673775527d20c121670e0a6ed1f7d75a87aca6031b6be7c48969324e01b9994ea2ac7af175c8c6b01b6845b874eafdd7415f4d34b5b08095730f
 DIST icinga-1.8.1.tar.gz 7543668 SHA256 3d02d80bdefc2518ab8517be6930a518b77747e0243fa594731fb1f95dbab916 SHA512 2a0d0c68c6f039e38281ac59ef4145997728bfbd5c869f89cb329a9fc522db0315bc31c629ce2c04b58a7a980675ade5dd06d461ee4c904f0002b101377c9af0 WHIRLPOOL fc3282200a076ae6da3ae7f615c8a5b35abd38e65c86fb9763c974d128294457830f78fc157b792c7ec46d54250fae9a2432556ea489e9d3ab6a35879a32eac8
+DIST icinga-1.8.2.tar.gz 7458441 SHA256 39b69a8676895cf458fb71a2ebe75806ea6014bff6ac09871f330f293a6de0c9 SHA512 daa95d90a2e8f5a100d16d82700c54ff2f43ed6ba7fb327ebd079e93e58bdd821a7c8d77f07c74b8a02f5d73b55b208e60585fabed6abf9a01af0c1b3967c8ee WHIRLPOOL 6f8f0306fa8311d04b7cfa38ce5fa08ac1e0d616c8eb6784018b56d6ca1820bbbd7248b6190847628f0ae1f391ecc71e83a5acf4710f7c5ba26f565ad65f6e29
 EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
 EBUILD icinga-1.8.0.ebuild 7515 SHA256 e1a9bb61334f865b950816aa4329664186cce4226b4c1a66e6069b0ddb038483 SHA512 ed3884c1cd650aee9eb441a927b064e7cb3c9fe3addf3774e95d3ba1a8b3a9b41fb3a8bf58c00a3bf3cb2019e8620ea6745995e643f42f24bbadcc75b343a193 WHIRLPOOL aa25c54a4786e6ad390fa90f807d9926388eb4c8c271226fbd48a157dc59dde79fcdef9fcedf2c0a4a6f6d2b1c0f4b2f546b2995a4b9fda08e5ee159d42c704e
 EBUILD icinga-1.8.1.ebuild 7515 SHA256 e1a9bb61334f865b950816aa4329664186cce4226b4c1a66e6069b0ddb038483 SHA512 ed3884c1cd650aee9eb441a927b064e7cb3c9fe3addf3774e95d3ba1a8b3a9b41fb3a8bf58c00a3bf3cb2019e8620ea6745995e643f42f24bbadcc75b343a193 WHIRLPOOL aa25c54a4786e6ad390fa90f807d9926388eb4c8c271226fbd48a157dc59dde79fcdef9fcedf2c0a4a6f6d2b1c0f4b2f546b2995a4b9fda08e5ee159d42c704e
+EBUILD icinga-1.8.2.ebuild 7517 SHA256 f50d6ee077054243f96f2c1f520fd66999d10a6459832d30221f200d1647fd1f SHA512 45451fef0e4aeb67a8429a2199c618f2d683b3603671a92b8ff227bccc9c58877184b33cba936c580e88a004883ce44109ed9ef5b53ebed39b4a9f27fbc6f24a WHIRLPOOL 64ecdcf3efaaff5c22b27c498dde2460df52341c00acc5499edcc638294ad09bccbfc06d9a669468bf18249431d19415f39016451527fbb8f24499f5da1519c5
 MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86

diff --git a/net-analyzer/icinga/icinga-1.8.2.ebuild b/net-analyzer/icinga/icinga-1.8.2.ebuild
new file mode 100644
index 0000000..cb7423c
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.8.2.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.2.ebuild,v 1.4 2012/09/17 19:48:49 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 ~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
+
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	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"
+			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
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2012-12-06  4:13 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-23  3:45 [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/ Matt Thode
  -- strict thread matches above, loose matches on Subject: below --
2012-12-06  4:13 Matt Thode
2012-10-25  4:32 Matt Thode
2012-10-23  2:40 Matt Thode
2012-05-15 20:14 Matt Thode
2012-05-14 19:11 Matt Thode
2012-05-14 18:52 Matt Thode
2012-05-14 18:22 Matt Thode
2012-02-27 21:20 Matt Thode
2012-02-27  4:10 Matt Thode
2011-12-03  8:32 Matt Thode
2011-12-03  8:31 Matt Thode
2011-12-02 21:03 Matt Thode
2011-11-26 19:44 Matt Thode
2011-11-26 19:43 Matt Thode
2011-11-25 19:33 Matt Thode
2011-11-25 17:59 Matt Thode
2011-11-25 17:59 Matt Thode

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox