From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SpiUu-0007mq-8q for garchives@archives.gentoo.org; Fri, 13 Jul 2012 16:13:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13490E0693; Fri, 13 Jul 2012 16:13:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C66A6E0693 for ; Fri, 13 Jul 2012 16:13:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B3441B40C2 for ; Fri, 13 Jul 2012 16:13:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C6020E5433 for ; Fri, 13 Jul 2012 16:13:20 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1342195011.8ac88fc1af769c4ee0bda6bdcfd8c02c8b6d9871.prometheanfire@gentoo> Subject: [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/ X-VCS-Repository: dev/prometheanfire X-VCS-Files: net-analyzer/icinga-web/Manifest net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild X-VCS-Directories: net-analyzer/icinga-web/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 8ac88fc1af769c4ee0bda6bdcfd8c02c8b6d9871 X-VCS-Branch: master Date: Fri, 13 Jul 2012 16:13:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 736d81ce-d492-456c-9383-7d77d8d5bd8e X-Archives-Hash: 28674faeee7554f1468d655d4f58288e commit: 8ac88fc1af769c4ee0bda6bdcfd8c02c8b6d9871 Author: Matthew Thode mthode org> AuthorDate: Fri Jul 13 15:56:51 2012 +0000 Commit: Matt Thode gentoo org> CommitDate: Fri Jul 13 15:56:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/prometheanfire= .git;a=3Dcommit;h=3D8ac88fc1 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/M= anifest 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 0d73c244fa69d= ebc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05= SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85 -DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e2= 5ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d6= 99355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4 DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154= f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f= 243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef -EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395= c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb= 7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a EBUILD icinga-web-1.7.1-r1.ebuild 4838 RMD160 2563e7663babe8a9ba26d97875= 66d860fadcda3b SHA1 b78fc5f399c7f5c1f01f6e226cd795477fe703fa SHA256 d4011= 3fb19d7b6219db7810dc373d720caca1816b93ee8969b332679a1549c13 +EBUILD icinga-web-1.7.1-r2.ebuild 5038 RMD160 16a921f0514654b62830eae4d5= 86b67b6d0017b0 SHA1 71ce8cdab51f21b1e50433a42c48d75fa8bff842 SHA256 be111= f4f15624e9e91e29fab1e22bdcfc9196124eefd9e6e44f095534fbba034 MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 = 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16d= c69304cf8b41cf093ec09a7d08bac9446da6df5 diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-ana= lyzer/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=3D"2" - -inherit depend.apache eutils - -DESCRIPTION=3D"Icinga Web - new Web Interface" -HOMEPAGE=3D"http://www.icinga.org/" -SRC_URI=3D"mirror://sourceforge/icinga/${P}.tar.gz" -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64" -IUSE=3D"pnp" -DEPEND=3D"dev-php/phing - dev-lang/php[postgres,pdo,json,xsl] - net-analyzer/icinga[apache2,idoutils,mysql]" -RDEPEND=3D"${DEPEND}" - -need_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_configure() { - local myconf - - myconf=3D"--prefix=3D/usr/share/icinga/icinga-web - --bindir=3D/usr/sbin - --sbindir=3D/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=3D/usr/share/icinga/htdocs - --localstatedir=3D/var/lib/icinga - --sysconfdir=3D/etc/icinga - --libexecdir=3D/usr/$(get_libdir)/icinga/plugins - --with-bin-user=3Dicinga - --with-bin-group=3Dicinga - --with-api-cmd-file=3D/var/lib/icinga/rw/icinga.cmd - --with-conf-dir=3D/etc/icinga-web - --with-web-apache-path=3D${APACHE_MODULES_CONFDIR} - --with-log-dir=3D/var/log/icinga-web" - - econf ${myconf} -} - -src_install() { - emake -j1 DESTDIR=3D"${D}" install || die "make failed" - - emake -j1 DESTDIR=3D"${D}" install-javascript || die "make failed" - - dodir ${APACHE_MODULES_CONFDIR} - emake -j1 DESTDIR=3D"${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/ic= ingaCron - - 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_I= ntegration/templateExtensions/pnp-host-extension.xml - insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/exten= sions/ - doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xm= l - 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-ana= lyzer/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=3D"2" + +inherit eutils + +DESCRIPTION=3D"Icinga Web - new Web Interface" +HOMEPAGE=3D"http://www.icinga.org/" +SRC_URI=3D"mirror://sourceforge/icinga/${P}.tar.gz" +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~x86 ~amd64" +IUSE=3D"apache2 mysql pnp postgres" +DEPEND=3D"dev-php/phing + dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json] + pnp? ( net-analyzer/pnp4nagios )" +RDEPEND=3D"${DEPEND}" + +pkg_setup() { + enewgroup icinga = =20 + enewgroup nagios = =20 + enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" +} + +src_prepare() { + epatch "${FILESDIR}/${P}-disable-compression.patch" +} + +src_configure() { + local myconf + myconf=3D"--prefix=3D/usr/share/icinga/icinga-web + --bindir=3D/usr/sbin + --sbindir=3D/usr/$(get_libdir)/icinga/cgi-bin + --datarootdir=3D/usr/share/icinga/htdocs + --localstatedir=3D/var/lib/icinga + --sysconfdir=3D/etc/icinga + --libexecdir=3D/usr/$(get_libdir)/icinga/plugins + --with-bin-user=3Dicinga + --with-bin-group=3Dnagios + --with-api-cmd-file=3D/var/lib/icinga/rw/icinga.cmd + --with-conf-dir=3D/etc/icinga-web + --with-log-dir=3D/var/log/icinga-web + --with-icinga-objects-dir=3D/etc/icinga/objects + --with-icinga-bin=3D/usr/sbin/icinga + --with-icinga-cfg=3D/etc/icinga/icinga.cfg" + + if use apache2 ; then + myconf+=3D" --with-web-user=3Dapache + --with-web-group=3Dapache + --with-web-apache-path=3D/etc/apache2/modules.d/" + else + myconf+=3D" --with-web-user=3Droot + --with-web-group=3Droot" + fi + + if use postgres ; then + myconf+=3D" --with-db-type=3Dpgsql + --with-db-port=3D5432 + --with-api-subtype=3Dpgsql + --with-api-port=3D5432" + fi + + econf ${myconf} +} + +src_install() { + dodoc README + rm -f README + + emake -j1 DESTDIR=3D"${D}" install || die "make failed" + emake -j1 DESTDIR=3D"${D}" install-javascript || die "make failed" + + if use apache2 ; then + dodir /etc/apache2/modules.d/ + emake -j1 DESTDIR=3D"${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/ic= ingaCron + + 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/exten= sions/ + doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xm= l + 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-we= b/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 'i= cinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql" + einfo " echo \"FLUSH PRIVILEGES;\" | mysql" + einfo + einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql ici= nga_web" + einfo + + ewarn + ewarn "If you're upgrading from a previous release, you must upgrade yo= ur database schema." + ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/con= trib/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__to_.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 +} +