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

["Matt Thode" <prometheanfire@gentoo.org>]

commit:     8ac88fc1af769c4ee0bda6bdcfd8c02c8b6d9871
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Jul 13 15:56:51 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 15:56:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8ac88fc1

removed 1.6.1, removed some apache eutils stuff, it will be pulled in if
the use flag is set.

---
 net-analyzer/icinga-web/Manifest                   |    3 +-
 net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild |   82 ----------
 net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild |  164 ++++++++++++++++++++
 3 files changed, 165 insertions(+), 84 deletions(-)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 1245f65..9abb31a 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,6 +1,5 @@
 AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
-DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
 DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
-EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
 EBUILD icinga-web-1.7.1-r1.ebuild 4838 RMD160 2563e7663babe8a9ba26d9787566d860fadcda3b SHA1 b78fc5f399c7f5c1f01f6e226cd795477fe703fa SHA256 d40113fb19d7b6219db7810dc373d720caca1816b93ee8969b332679a1549c13
+EBUILD icinga-web-1.7.1-r2.ebuild 5038 RMD160 16a921f0514654b62830eae4d586b67b6d0017b0 SHA1 71ce8cdab51f21b1e50433a42c48d75fa8bff842 SHA256 be111f4f15624e9e91e29fab1e22bdcfc9196124eefd9e6e44f095534fbba034
 MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5

diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
deleted file mode 100644
index ee11639..0000000
--- a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit depend.apache eutils
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pnp"
-DEPEND="dev-php/phing
-        dev-lang/php[postgres,pdo,json,xsl]
-        net-analyzer/icinga[apache2,idoutils,mysql]"
-RDEPEND="${DEPEND}"
-
-need_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--prefix=/usr/share/icinga/icinga-web
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--libexecdir=/usr/$(get_libdir)/icinga/plugins
-	--with-bin-user=icinga
-	--with-bin-group=icinga
-	--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
-	--with-conf-dir=/etc/icinga-web
-	--with-web-apache-path=${APACHE_MODULES_CONFDIR}
-	--with-log-dir=/var/log/icinga-web"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make failed"
-
-	emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
-
-	dodir ${APACHE_MODULES_CONFDIR}
-	emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
-	mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/* || die
-
-	sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
-	sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
-
-	insinto /etc/cron.d/
-	doins etc/scheduler/icingaCron || die
-
-	diropts -o apache -g apache
-	dodir /var/log/icinga-web
-
-	fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
-
-	if use pnp ; then
-		sed -i 's/booleanConditionField/booleanConfitionField/g' contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
-		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
-		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
-		doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
-	fi
-}
-
-pkg_postinst() {
-	elog "do not forget to import the Database!"
-	elog
-}
-

diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
new file mode 100644
index 0000000..2df97df
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+        dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
+		pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup icinga                                                            
+	enewgroup nagios                                                            
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-disable-compression.patch"
+}
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr/share/icinga/icinga-web
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--libexecdir=/usr/$(get_libdir)/icinga/plugins
+	--with-bin-user=icinga
+	--with-bin-group=nagios
+	--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+	--with-conf-dir=/etc/icinga-web
+	--with-log-dir=/var/log/icinga-web
+	--with-icinga-objects-dir=/etc/icinga/objects
+	--with-icinga-bin=/usr/sbin/icinga
+	--with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+	if use apache2 ; then
+		myconf+=" --with-web-user=apache
+		--with-web-group=apache
+		--with-web-apache-path=/etc/apache2/modules.d/"
+	else
+		myconf+=" --with-web-user=root
+		--with-web-group=root"
+	fi
+
+	if use postgres ; then
+		myconf+=" --with-db-type=pgsql
+		--with-db-port=5432
+		--with-api-subtype=pgsql
+		--with-api-port=5432"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	dodoc README
+	rm -f README
+
+	emake -j1 DESTDIR="${D}" install || die "make failed"
+	emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
+
+	if use apache2 ; then
+		dodir /etc/apache2/modules.d/
+		emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
+		mv ${D}/etc/apache2/modules.d/icinga-web.conf ${D}/etc/apache2/modules.d//99_icinga-web.conf
+	fi
+
+	insinto /usr/share/icinga/icinga-web/contrib
+	doins -r etc/schema/* || die
+
+	if use apache2 ; then
+		sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
+	else
+		sed -i 's/%%USER%%/root/g'  etc/scheduler/icingaCron
+	fi
+	sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
+
+	insinto /etc/cron.d/
+	doins etc/scheduler/icingaCron || die
+
+	if use apache2 ; then
+		diropts -o apache -g apache
+	else
+		diropts -o root -g root
+	fi
+	dodir /var/log/icinga-web
+
+	if use apache2 ; then
+		fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	else
+		fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+	fi
+
+
+	if use pnp ; then
+		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
+		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+		doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
+	einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
+	einfo
+	einfo "Additionally, you need to setup a database user."
+	einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
+	einfo
+	einfo "Example for a MySQL database:"
+	einfo "  echo \"CREATE DATABASE icinga_web;\" | mysql"
+	einfo "  echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
+	einfo "  echo \"FLUSH PRIVILEGES;\" | mysql"
+    einfo
+	einfo "  cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
+	einfo
+
+    ewarn
+	ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
+	ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
+	ewarn
+	ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
+	ewarn "           be advised that you need to apply those upgrade files with incremental steps!"
+	ewarn
+	ewarn "Example to upgrade a MySQL database:"
+	ewarn "  cat  /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
+	ewarn
+	ewarn "Don't forget to clear the config cache."
+	ewarn "  /usr/share/icinga/icinga-web/bin/clearcache.sh"
+	ewarn
+
+	einfo
+	einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
+	einfo
+
+	if use apache2 ; then
+		einfo
+		einfo "apache config was installed into"
+		einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+		einfo
+		einfo "The apache config value for \'ServerTokens\' must be set to at"
+		einfo "least \'Min\'."
+		einfo
+	else
+		einfo
+		einfo "If you are not using apache you may need to change some"
+		einfo "permissions, so that your web server can access files and logs"
+		einfo
+	fi
+}
+