updated to fix cron for bug 431762 and removed the now unneeded compression patch

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 221 insertions, 10 deletions

diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
index d3d864e5f5ae..e3366113a4f1 100644
--- a/net-analyzer/icinga-web/ChangeLog
+++ b/net-analyzer/icinga-web/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/icinga-web
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.3 2012/07/22 00:33:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.4 2012/08/17 20:31:15 prometheanfire Exp $
+
+*icinga-web-1.7.2 (17 Aug 2012)
+
+  17 Aug 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-web-1.7.2.ebuild:
+  update to 1.7.2 to get rid of need to patch for compression and fix crontab
+  for bug #431762
 
   22 Jul 2012; Christian Ruppert <idl0r@gentoo.org> icinga-web-1.7.1-r1.ebuild:
   Add missing inherits
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 4b3bd5cbc6f8..a03e26fc2134 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX icinga-web-1.7.1-disable-compression.patch 3120 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85 SHA512 09eccfe66bab2650e0146582511717ecd082139e0e29c95b9ebeccb37706a0a4c23f7c7a051561d65b77c749c7c6fbc3bf3ac0e1fcd405dff647400d23b44056 WHIRLPOOL 185e78e2b62c01d2867c476de329a077bbab77b29777acccd618016a3383a98879dd5b51c78bad47440f56b8497a2b1e10608a1a19466a0a80b6af5cf80f10de
 DIST icinga-web-1.7.1.tar.gz 14551987 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef SHA512 284d1bd7cc41dd6bc66afd5adc5ec48671c1db9e9f2cfb9458ef557f0d2da0506da617d914309e5052fb94afc85909dd0262837677204d22bd32fa7ac5adf9a5 WHIRLPOOL 809dbbe7169b39ccf373645a7e14d752e249c8741e29d42ea2ac0829bafd9503c3cc0c9944f3ba1805b20bf267a0e4b8c141cbee4a423362078d68bab029baaa
+DIST icinga-web-1.7.2.tar.gz 13843464 SHA256 507cb8b4d1bfc09004a4a933c82e86f69c9c4703e17f57c2c81b4949b490db52 SHA512 ea83dad298536730755187a1e179ce9fdb7425580684b8583e020a44581e7e89f93f5ba4e3d0c362740a1b2b4e67e0c3707fad17583f7819c10d4cd653eb363d WHIRLPOOL 52e60fcb290b73fac46ba3ca42060c4cfe4a54b30caf9a13a3df43ac4f7a47c39d2603eaecc95bdc2cbfdf065f53febf68d0bcf904c18c6beb0421f1d65c0592
 EBUILD icinga-web-1.7.1-r1.ebuild 5280 SHA256 1eaf45343625252757278eb1ac22a1fe7ded71b0092c2e3359550da1cd42b0d5 SHA512 d9e017ae8735e63a1cc688de6d550703e868ce49d1f6a2adac16ac108e80bf3498bdca47272da5ca6e776ffb1ac5b5abd8e56b2d4276ce0dbdc1cf74bc524221 WHIRLPOOL bbf921e4e24581ff3f31a2f972a306e05f308e43ad36d0e7454df8229dd09b1ce4aab2cb456208f20f67620b3565d2b8f20a9e2993914e2ed1104e633855d6a2
-MISC ChangeLog 944 SHA256 0b2770f59709012c1c38fab299286d636f01f1c17c9766bd5e1ca25600f5ebfb SHA512 537f104ee402e27dcbf08daca75dfb0da456244456024af1ed9c514fe563abb07cc5cc136ecf57915dcf3ac644f0fbcfd2a9d898cfbc4570b74d0b2fd1751529 WHIRLPOOL 849abd2069e2b7dd54810bcb669f0f930d6ef92787635aee2f133e7d2316cfe432c9a06d3faa623000f823aab072932bb4cd917a1bac4fe41d95c4d06016b722
+EBUILD icinga-web-1.7.2.ebuild 6098 SHA256 f9c2c28d6c45cc4f741c39bb3276398a25aa4245132d0e8df2ec3f2454481935 SHA512 bc33769d5e2d473fc98b21453d2db96f648d9194058d5de46444aaac6335aa8e4de329bb15c8c1ccf4d559eecac6fdbbf8f1b48f145a0303e86dd143aac415bc WHIRLPOOL 471eaec330ae1919b482d2de6ba165782aa4bd735b3c8ab4577bc0576384fda6632a1b3dade7177c11b67526744edd3849103ae34fb94edcbff38d808e71bd2d
+MISC ChangeLog 1168 SHA256 8370821e02f27c8a7ce7996213b8e8f0bdcbcea3ac1d0ed5a528d1d4d26617c4 SHA512 ae02b0b1681aeae3ea4585f000c29f0e4341abf2320cae7f003bcbf73cc0d99cc4bf2ba948f1c200330191915447e3d485e2b123c7257eac3f36ffcf317055f1 WHIRLPOOL e8604dac594d9773dd7c9ff4df10a6a1030e87d242e6a7ca14160e027c3aa0956bb6737c92e38280970d8eed3662241478dca54d24dd1f72ef3913b9c64f51f4
 MISC metadata.xml 419 SHA256 49679fa6aac480dadb07969911c1ea1fd09b7fd67b28be3ffc121333426dac61 SHA512 31f0c6fe93a928fee82cd8fb970dafdaf7b9f830c44ca33621fac89998ee0ab416ef851ac76a8019dc8fba93db331ba627e2ae42257d80a9615d12b03fbeffe1 WHIRLPOOL 8cbed9673cc9bb5797643e4cdbfc6adc378d5baa3e877614b7b0d55ad4d659e979283d9323c57938a301aa787edd7a66fb3e2882b0eba4ff90c638b0344801e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQC0p6AAoJEMOx0zmdw4Z1POgH/ifjKD2yr4i9EWqAVIQMTIJJ
-yghVlPCCQzW4v2kEckne6bVFMUUv7T6FtiK6Wg8kfFsw0jmzz8nYqqhetI1oT+AG
-IgFY8mSo8Ib371xWh3pjqadbC+OPBPW1sFCcnyv25SIQDKUY1mCJ4frFM4nTFs1z
-npvCateF9z8NOcHmF5YxmLY48bQAhjtEh0KJAFJH0AHatGEJw9Ei4MAlSml8Colr
-NJSc/RgAP1b44Az2mA+uGINRciQ6Zp6Ax/ERyWUPucc+l3q4V/BsdyUqKxf/aFea
-02Q7QqXr/bYY1pHbs0GjPzx+cPcSD37DaL0+fECB2fAF1W7NOomfgHBNN7yG2P4=
-=4Jbn
+iQIcBAEBAgAGBQJQLqofAAoJECRx6z5ArFrDjfkQAJ1dPcvGXm+qNDZSQBoQjmTe
+yasruCivMqNQ7R1ATyoMeC+Q3KipvFYK9emxxYe2oI4bREES0Zv0W+SJTlG/AeUe
+ngaV3HVN4hLtGqDZfHBBXgJQsPfxSX8YwtLQCcZ6/wv62794oS9CTnn+3+ph058s
+f7ozvD6HedGELjYY3iRDqORbsBKrS05y9+dkmXrO/GZyENqvc/wM7AXHPLEJft2X
+h2M+Cp7yq9adPZDCYtfSoPY++GUZvFrswvimJ8OE+lv9zP/2vBa8728n3+SUX58n
+Y/jWVAZu58fM/+nbPebvf+UXRjAH/R49HR4OnBMDv7QFiRv65rnKPCA7BLQLWWuB
+CktImhyAOoONdkZs/vD67zJTCkgWzIB+nLHvT4VZAPM+mFCUPZAqZu4ot6aAePRY
+j6BcpK0PyUlUHa6gu8uiMj8hCkXR9iLXNPKAFe+1pl964plV/7ivU8oeEDbdRsHL
+z9IZPxeJA3jkvBLqRzxRu3SFJhmAQUNhwr3cmj2lu5NZiB302UGiqku3oIwqMcId
+uJtQUUjlhYiwMpjxRlihxagz2qI7pNECLM8mfACEkMe9mrRTIBVqLyLxavsuAtDn
+9oUriqK5I/vWXr1Y3xj1MOxlvuI+QbOjYIfZXptE1FmgtbE0OOGc7gNNly5O+gvT
+vAf5ElbdUF9McGVnZWK/
+=F5Y7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.2.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.2.ebuild
new file mode 100644
index 000000000000..3cd5ccda8418
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.7.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.7.2.ebuild,v 1.1 2012/08/17 20:31:15 prometheanfire Exp $
+
+EAPI="2"
+
+inherit depend.apache eutils user multilib
+
+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}"
+
+want_apache2
+
+pkg_setup() {
+	if use apache2 ; then
+		depend.apache_pkg_setup
+	fi
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+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=${APACHE_MODULES_CONFDIR}"
+	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 DESTDIR="${D}" install || die "make failed"
+
+	emake DESTDIR="${D}" install-javascript || die "make failed"
+
+	if use apache2 ; then
+		dodir ${APACHE_MODULES_CONFDIR}
+		emake DESTDIR="${D}" install-apache-config || die "make failed"
+		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/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
+
+	dodir /usr/share/icinga/icinga-web/cron/
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
+# Force the shell to bash
+SHELL=/bin/bash
+#mail to root
+MAILTO=root
+
+#runs every minute
+* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
+# Mail reports to root
+!mailto(root)
+
+#runs every minute
+@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
+EOF
+
+	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_config() {
+	einfo "press enter to install the icinga-web crontab"
+	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
+	einfo
+	read
+
+	if has_version sys-process/fcron; then
+		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
+	else
+		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
+	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
+}