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 1Sp1tI-0000Lp-2x for garchives@archives.gentoo.org; Wed, 11 Jul 2012 18:44:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 346B1E0773; Wed, 11 Jul 2012 18:43:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EC077E0773 for ; Wed, 11 Jul 2012 18:43:42 +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 381F41B402F for ; Wed, 11 Jul 2012 18:43:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ECE84E5431 for ; Wed, 11 Jul 2012 18:43:40 +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: <1342032197.ef0ab25f57ca42ed3f6a88b304fbc1a50017202d.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.7.1-r1.ebuild X-VCS-Directories: net-analyzer/icinga-web/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: ef0ab25f57ca42ed3f6a88b304fbc1a50017202d X-VCS-Branch: master Date: Wed, 11 Jul 2012 18:43:40 +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: 0db6efc3-296e-45a2-bde9-76c2210b9300 X-Archives-Hash: 4763b5fe11d9a708f3de5141b456ebc0 commit: ef0ab25f57ca42ed3f6a88b304fbc1a50017202d Author: Matthew Thode gentoo org> AuthorDate: Wed Jul 11 18:43:17 2012 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed Jul 11 18:43:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/prometheanfire= .git;a=3Dcommit;h=3Def0ab25f trying to make it work without forcing apache --- net-analyzer/icinga-web/Manifest | 2 +- net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 61 ++++++++++++++= +---- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/M= anifest index ce726b4..95b7912 100644 --- a/net-analyzer/icinga-web/Manifest +++ b/net-analyzer/icinga-web/Manifest @@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD16= 0 0d73c244fa69debc37be8 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 3774 RMD160 da14977471eedd10ddf2daa51f= ffaf59ff0409b4 SHA1 010109dd1f9ebc5ec534dbac2e92f530df692492 SHA256 1ff7c= c5d9d44106150b19214851b0386b916103208c990ede924564b6406c105 +EBUILD icinga-web-1.7.1-r1.ebuild 4609 RMD160 1bf979d5e6f4fac18a802dd83e= c31290c4c1daed SHA1 e12afed3c25411f9b58775c0ab67a770258ac2a7 SHA256 4302a= 7bb6ba48c002a5cfcb142a60ee985e99520eda1fa61dd0f6f51ba7afc62 MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 = 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16d= c69304cf8b41cf093ec09a7d08bac9446da6df5 diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-ana= lyzer/icinga-web/icinga-web-1.7.1-r1.ebuild index b91149e..77e3304 100644 --- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild +++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild @@ -12,16 +12,19 @@ SRC_URI=3D"mirror://sourceforge/icinga/${P}.tar.gz" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"pnp" +IUSE=3D"apache mysql pnp postgres" DEPEND=3D"dev-php/phing - dev-lang/php[apache2,cli,mysql,pdo,json] - net-analyzer/icinga[apache2,idoutils,mysql]" + dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json] + pnp? ( net-analyzer/pnp4nagios )" RDEPEND=3D"${DEPEND}" =20 need_apache2 =20 pkg_setup() { depend.apache_pkg_setup + enewgroup icinga = =20 + enewgroup nagios = =20 + enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" } =20 src_prepare() { @@ -39,14 +42,24 @@ src_configure() { --sysconfdir=3D/etc/icinga --libexecdir=3D/usr/$(get_libdir)/icinga/plugins --with-bin-user=3Dicinga - --with-bin-group=3Dicinga - --with-web-user=3Dapache - --with-web-group=3Dapache - --with-web-apache-path=3D${APACHE_MODULES_CONFDIR} + --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" =20 + if use apache ; then + myconf+=3D" --with-web-user=3Dapache + --with-web-group=3Dapache + --with-web-apache-path=3D${APACHE_MODULES_CONFDIR}" + else + myconf+=3D" --with-web-user=3Droot + --with-web-group=3Droot" + fi + + if use postgres ; then + myconf+=3D" --with-db-type=3Dpostgres" + fi + econf ${myconf} } =20 @@ -55,23 +68,38 @@ src_install() { =20 emake -j1 DESTDIR=3D"${D}" install-javascript || die "make failed" =20 - 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 + if use apache ; then + 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_MODULE= S_CONFDIR}/99_icinga-web.conf + fi =20 insinto /usr/share/icinga/icinga-web/contrib doins -r etc/schema/* || die =20 - sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron + if use apache ; 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 =20 insinto /etc/cron.d/ doins etc/scheduler/icingaCron || die =20 - diropts -o apache -g apache + if use apache ; then + diropts -o apache -g apache + else + diropts -o root -g root + fi dodir /var/log/icinga-web =20 - fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/= res/storage.dat + if use apache ; 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 + =20 if use pnp ; then insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/exten= sions/ @@ -113,5 +141,12 @@ pkg_postinst() { einfo einfo "Please note that the magic_quotes_gpc setting must be disabled (= in both apache and cli php.ini)." einfo + + if use apache ; then + einfo + einfo "The apache config value for \'ServerTokens\' must be set to at" + einfo "least \'Min\'." + einfo + fi } =20