net-analyzer/icinga: New version of icinga (it works now), thanks to chithead

svn path=/sunrise/; revision=11273

12 files changed, 394 insertions, 49 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 0bda5ba9f..60f0f0e47 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Sep 2010; mthode <mthode@mthode.org> -icinga-1.0.2.ebuild,
+  +icinga-1.0.3.ebuild, +files/icinga-apache.conf, +files/icinga-conf.d,
+  +files/icinga-init.d, +files/icinga-lighty.conf, +files/ido2db-conf.d,
+  +files/ido2db-init.d, +files/metadata.xml, metadata.xml:
+  New version of icinga (it works now), thanks to chithead
+
   14 Jul 2010; Matthew Thode (prometheanfire) <mthode@mthode.org>
   +icinga-1.0.2.ebuild, +metadata.xml:
   New Ebuild for bug 271339 thanks to chithead
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 593fb0739..c77b17bd8 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,4 +1,11 @@
-DIST icinga-1.0.2.tar.gz 8446607 RMD160 782ebbad8ce4e88a3e214ba12802fe7d968ce851 SHA1 d4325b87369d9bbfc1d52da071e8cc24bdc3d2dd SHA256 3e827712cef7afd074048e5bf48140744c2bdd9607235997e947d1eb8c7665c4
-EBUILD icinga-1.0.2.ebuild 898 RMD160 7b0b621da09dccf14c0b8d7fe5f719a85b385777 SHA1 011ecea521c3a9b88a34897415cf4a31cd75fdc5 SHA256 9ecc2c317014d01d811183acb33789523df983366d89679982d36c9f3653e031
-MISC ChangeLog 273 RMD160 edddb896784bf2db535de407687e5c08b370699d SHA1 fd9723fcc1a128416b7e098416190538e6a463e0 SHA256 9808d3839e4542fac7c561c970c5b045e79c70411215e12a489a688fce03c73d
-MISC metadata.xml 322 RMD160 9cf9330dfae317dba606225f5b5031e1873ff937 SHA1 dbdb644e6993c4021de657fbfd825dbbcadbfd02 SHA256 63c458bdecf6838907f9fd09270f66bc1c760b292b8636fbd52895c9e69d07ec
+AUX icinga-apache.conf 377 RMD160 bd009d51035802deb5efd3aaf0b726ca7ef34e2e SHA1 7ba572b8ed52695a8278cc5d57df3fd8cf59dca8 SHA256 e2a17742d8a74f31fd038cbf33533ccdeaed8604cfa026d0fdbb24d3a46e30f9
+AUX icinga-conf.d 397 RMD160 4f0b656cd8c74e0132080bdea6c040e5cc5eb23f SHA1 664a80063a83b7e5bfac8bef066dd3f32b149925 SHA256 076c12f7822124c47fb3634164c381fbc5dce51f45ac9f9a8e389244cab29ad3
+AUX icinga-init.d 1431 RMD160 3369ca897115bb34d07710daa3b12089f89c63dc SHA1 7569c98c49df48745b15489dbe6efad1e243008f SHA256 c2b7b4e15fe2514a62a97d1ec167796c19df8068c9639c74b06bbeaf25d63626
+AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
+AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
+AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
+AUX metadata.xml 310 RMD160 c92afd2ac94d8a6950246be87547741d5416624c SHA1 2866924d3d59986a0e993755ff5eda4884ea2d0f SHA256 0c9cec7c42b1e5e488997f803ab32cd58ea9428bd57ac352ce0109c421067445
+DIST icinga-1.0.3.tar.gz 8583094 RMD160 74bb5022eb6708477128a418baec5324b7f07311 SHA1 07edc061fe88d36366a3408d7138699c287673df SHA256 ae67d10f81767b224fc2768ee58a328c88eda62676fcf5b26fee75e2f79939cd
+EBUILD icinga-1.0.3.ebuild 7223 RMD160 f09969308e4398d0dfecec30d2c6c4c7f3c9a153 SHA1 582cfbf6effe3bba368453789af825078d58d265 SHA256 e92301a47bc5d0bd03672e1f281801337aa06842a6d33dc74a0db6cd3b63eef0
+MISC ChangeLog 602 RMD160 785c5f460e6fc35f936d3f0f4ed18b528f5b074f SHA1 2d48fd6ed0948fa1dd9a266ee0de84eb491e70c7 SHA256 782bebf0acc67737e7073294d62fa0548b335edf0c5179d3c91a059ba511bdba
+MISC metadata.xml 606 RMD160 9eb6817db7cbca092fcafe184597663bb6a90aeb SHA1 92134b37a653b10431460a91e383ca15fd3ad5f9 SHA256 a2ed0f09f4efe7c9bd24681600504be30baa82c4f180ecd7aa724abe17296cf2
diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf
new file mode 100644
index 000000000..e1a0199fe
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-apache.conf
@@ -0,0 +1,15 @@
+<IfDefine ICINGA>
+	ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/
+	<Directory "/usr/lib/icinga/cgi-bin/">
+		AllowOverride AuthConfig
+		Options ExecCGI
+		Order allow,deny
+		Allow from all
+	</Directory>
+	Alias /icinga /usr/share/icinga/htdocs
+	<Directory "/usr/share/icinga/htdocs">
+		AllowOverride AuthConfig
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfDefine>
diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d
new file mode 100644
index 000000000..b8bd03bb0
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-conf.d
@@ -0,0 +1,7 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $
+
+# Distributed monitoring users will want to configure here the ip/hostname of the central server.
+# It will be used by submit_check_result_via_nsca.
+NAGIOS_NSCA_HOST="localhost"
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
new file mode 100644
index 000000000..06817bd04
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/icinga3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $
+
+opts="${opts} reload checkconfig"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	killall -HUP icinga &>/dev/null
+	eend $?
+}
+
+checkconfig() {
+	# Silent Check
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting icinga"
+	touch /var/icinga/icinga.log /var/icinga/status.sav
+	chown icinga:icinga /var/icinga/icinga.log /var/icinga/status.sav
+	rm -f /var/icinga/rw/icinga.cmd
+	start-stop-daemon --quiet --start --startas /usr/sbin/icinga -e HOME="/var/icinga/home" --pidfile /var/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping icinga"
+	start-stop-daemon --quiet --stop --pidfile /var/icinga/icinga.lock
+	rm -f /var/icinga/status.log /var/icinga/icinga.tmp /var/icinga/icinga.lock /var/icinga/rw/icinga.cmd
+	eend $?
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting icinga"
+	svc_stop
+	svc_start
+	eend $?
+}
diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf
new file mode 100644
index 000000000..678f2331e
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-lighty.conf
@@ -0,0 +1,24 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_auth")
+server.modules += ("mod_alias")
+
+auth.require += ( "/icinga" =>
+	(
+		"method"  => "digest",
+		"realm"   => "icinga",
+		"require" => "valid-user"
+	)
+)
+
+$HTTP["url"] =~ "^/icinga/cgi-bin/" {
+	dir-listing.activate = "disable"
+	cgi.assign = (
+		".pl"  => "/usr/bin/perl",
+		".cgi" => ""
+	)
+}
+
+alias.url += (
+	"/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin",
+	"/icinga"         => "/usr/share/icinga/htdocs"
+)
diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d
new file mode 100644
index 000000000..5429fa9a5
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-conf.d
@@ -0,0 +1 @@
+IDO2DBCFG="/etc/icinga/ido2db.cfg"
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
new file mode 100644
index 000000000..aed7a78ea
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+IDO2DBBIN="/usr/sbin/ido2db"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+start() {
+	ebegin "Starting ido2db"
+	start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ido2db"
+	start-stop-daemon --quiet --stop --pidfile /var/icinga/ido2db.lock --name /usr/sbin/ido2db
+	eend $?
+}
diff --git a/net-analyzer/icinga/files/metadata.xml b/net-analyzer/icinga/files/metadata.xml
new file mode 100644
index 000000000..3b6eacfab
--- /dev/null
+++ b/net-analyzer/icinga/files/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
+	<maintainer>
+		<email>mthode@mthode.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/icinga/icinga-1.0.2.ebuild b/net-analyzer/icinga/icinga-1.0.2.ebuild
deleted file mode 100644
index 63eb2b28b..000000000
--- a/net-analyzer/icinga/icinga-1.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A monitoring system based on Nagios"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbi ssl"
-
-RDEPEND="dbi? ( dev-db/libdbi-drivers )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup icinga
-	enewuser icinga -1 -1 -1 icinga
-}
-
-src_configure() {
-	econf --with-posix-regex \
-		$(use_enable ssl) \
-		$(use_enable dbi idoutils)
-}
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-unstripped install-api install-init install-config install-commandmode || die
-	if use dbi; then
-		emake DESTDIR="${D}" install-idoutils || die
-	fi
-	dodoc README THANKS AUTHORS || die "dodoc failed"
-}
diff --git a/net-analyzer/icinga/icinga-1.0.3.ebuild b/net-analyzer/icinga/icinga-1.0.3.ebuild
new file mode 100644
index 000000000..d01265d89
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.0.3.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/icinga-core-3.1.0.ebuild,v 1.3 2009/02/24 17:07:42 dertobi123 Exp $
+
+EAPI=2
+
+inherit eutils depend.apache toolchain-funcs
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 api debug +idoutils lighttpd +mysql perl plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( >=dev-lang/perl-5.6.1-r7 )
+	virtual/mailx
+	web? (
+		>=media-libs/gd-1.8.3-r5[jpeg,png]
+		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
+		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewuser icinga -1 /bin/false /var/spool/icinga icinga
+}
+
+src_prepare() {
+#	local strip="$(echo '$(MAKE) strip-post-install')"
+#	sed -i -e "s:${strip}::" ${WORKDIR}/{cgi,base}/Makefile.in || die "sed failed in Makefile.in"
+	if use api ; then
+		sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile.in || die "sed failed in Makefile.in"
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	if use perl ; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	myconf="${myconf} --disable-statuswrl $(use_enable idoutils) $(use_enable ssl)"
+
+	if use debug; then
+		myconf="${myconf} --enable-DEBUG0"
+		myconf="${myconf} --enable-DEBUG1"
+		myconf="${myconf} --enable-DEBUG2"
+		myconf="${myconf} --enable-DEBUG3"
+		myconf="${myconf} --enable-DEBUG4"
+		myconf="${myconf} --enable-DEBUG5"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--sbindir=/usr/$(get_libdir)/icinga/cgi-bin \
+		--datarootdir=/usr/share/icinga/htdocs \
+		--localstatedir=/var/icinga \
+		--sysconfdir=/etc/icinga \
+		--libexecdir=/usr/$(get_libdir)/icinga/plugins
+	if use api ; then
+	        sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile || die
+	fi
+	if use api ; then
+		cd module/icinga-api
+		econf --prefix=/usr \
+			--bindir=/usr/sbin \
+	        --sbindir=/usr/$(get_libdir)/icinga/cgi-bin \
+			--datarootdir=/usr/share/icinga/htdocs \
+			--localstatedir=/var/icinga \
+	        --sysconfdir=/etc/icinga \
+			--libexecdir=/usr/$(get_libdir)/icinga/plugins
+	fi
+}
+
+src_compile() {
+
+	emake CC=$(tc-getCC) icinga || die "make failed"
+
+	if use web ; then
+		# Only compile the CGI's if "web" useflag is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
+	fi
+
+	if use idoutils ; then
+		# Only compile IDOUtils if "idoutils" useflag is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
+			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
+			Makefile || die
+	fi
+	sed -i -e 's/^contactgroups$//g' Makefile || die
+
+	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install-config || die
+	emake DESTDIR="${D}" install-commandmode || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+	if use api ; then
+		 emake DESTDIR="${D}" install-api || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga
+	newconfd "${FILESDIR}"/icinga-conf.d icinga
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+	    elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+
+	fi
+
+	fowners -R icinga:icinga etc/icinga || die "Failed chown of etc/icinga"
+	fowners -R icinga:icinga var/icinga || die "Failed chown of var/icinga"
+
+	fowners -R root:root /usr/$(get_libdir)/icinga
+	find "${D}"/usr/$(get_libdir)/icinga -type d -print0 | xargs -0 fperms 755
+	find "${D}"/usr/$(get_libdir)/icinga/cgi-bin -type f -print0 | xargs -0 fperms 755
+
+	keepdir /etc/icinga
+	keepdir /var/icinga
+	keepdir /var/icinga/archives
+	keepdir /var/icinga/rw
+	keepdir /var/icinga/spool/checkresults
+
+	if use !apache2 && use !lighttpd; then
+		fowners -R icinga:icinga "${D}"/var/icinga/rw || die "Failed chown of /var/icinga/rw"
+	else
+		if use apache2 ; then
+			fowners -R icinga:apache /var/icinga/rw || die "Failed chown of /var/icinga/rw"
+		elif use lighttpd ; then
+			fowners -R icinga:lighttpd /var/icinga/rw || die "Failed chown of /var/icinga/rw"
+		fi
+	fi
+
+	fperms 6755 /var/icinga/rw || die "Failed Chmod of ${D}/var/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "To have ministatus.cgi requires copying of ministatus.c"
+		elog "to cgi directory for compiling."
+
+		elog "Note that the user your webserver is running at needs"
+		elog "read-access to /etc/icinga."
+		elog
+
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\""
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+
+	else
+		elog "Please note that you have installed Icinga without web interface."
+		elog "Please don't file any bugs about having no web interface when you do this."
+		elog "Thank you!"
+	fi
+
+	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
+}
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index e05d2ea12..4eebbd515 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -3,8 +3,14 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
+	<use>
+		<flag name="api">Adds support for the icinga API</flag>
+		<flag name="idoutils">Adds DB support</flag>
+		<flag name="lighttpd">Adds Lighttpd support</flag>
+		<flag name="plugins">Adds support for nagios plugins</flag>
+		<flag name="web">Adds generic web interface support</flag>
+	</use>
 	<maintainer>
-		<email>maintainer-wanted@gentoo.org</email>
+		<email>mthode@mthode.org</email>
 	</maintainer>
 </pkgmetadata>
-