Version bump, add Apache2 use-flag to allow for automagic integration into Apache (#302611) (Add -PNP to /etc/conf.d/apache2).

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 48 insertions, 70 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index e4ef581d5bd2..728d939eaa7d 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.15 2010/01/29 19:28:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.16 2010/04/02 16:50:16 dertobi123 Exp $
+
+*pnp4nagios-0.6.3 (02 Apr 2010)
+
+  02 Apr 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/98_pnp4nagios.conf, -pnp4nagios-0.4.14.ebuild,
+  -pnp4nagios-0.6.2.ebuild, +pnp4nagios-0.6.3.ebuild:
+  Version bump, add Apache2 use-flag to allow for automagic integration into
+  Apache (#302611) (Add -PNP to /etc/conf.d/apache2).
 
   29 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org>
   pnp4nagios-0.6.2.ebuild:
diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
new file mode 100644
index 000000000000..4879779a8f93
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
@@ -0,0 +1,22 @@
+<IfDefine PNP>
+        Alias /pnp4nagios /usr/share/pnp/
+        <Directory /usr/share/pnp>
+                AllowOverride AuthConfig
+                Order allow,deny
+                Allow from all
+                <IfModule mod_rewrite.c>
+                        # Turn on URL rewriting
+                        RewriteEngine On
+                        Options FollowSymLinks
+                        # Installation directory
+                        RewriteBase /pnp4nagios
+                        # Protect application and system files from being viewed
+                        RewriteRule ^(application|modules|system) - [F,L]
+                        # Allow any files or directories that exist to be displayed directly
+                        RewriteCond %{REQUEST_FILENAME} !-f
+                        RewriteCond %{REQUEST_FILENAME} !-d
+                        # Rewrite all other URLs to index.php/URL
+                        RewriteRule .* index.php/$0 [PT,L]
+                </IfModule>
+        </Directory>
+</IfDefine>
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild
deleted file mode 100644
index af2bf9f679f2..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild,v 1.1 2009/10/27 19:40:42 dertobi123 Exp $
-
-EAPI="2"
-
-MY_P=pnp-${PV}
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-lang/php-4.3[gd-external,pcre,xml,zlib]
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--with-perfdata-dir=/var/nagios/perfdata \
-		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
-}
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config || die "emake install failed"
-	doinitd "${FILESDIR}/npcd"
-}
-
-pkg_postinst() {
-	elog "To include the pnp webinterface into your Nagios setup you could use"
-	elog "an Alias in you Apache configuration as follows:"
-
-	elog "\tAlias /nagios/pnp       /usr/share/pnp/"
-	elog "\t<Directory "/usr/share/pnp">"
-	elog "\t\tAllowOverride AuthConfig"
-	elog "\t\tOrder allow,deny"
-	elog "\t\tAllow from all"
-	elog "\t</Directory>"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild
index 95271f289187..156467066aae 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild,v 1.3 2010/01/29 19:28:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild,v 1.1 2010/04/02 16:50:16 dertobi123 Exp $
 
 EAPI="2"
 
+inherit depend.apache
+
 DESCRIPTION="A performance data analyzer for nagios"
 HOMEPAGE="http://www.pnp4nagios.org"
 
@@ -14,12 +16,19 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND=">=dev-lang/php-4.3[gd-external,pcre,filter,reflection,spl,simplexml,xml,zlib]
+DEPEND=">=dev-lang/php-4.3[gd-external,json,pcre,filter,reflection,spl,simplexml,xml,zlib]
 	>=net-analyzer/rrdtool-1.2
 	net-analyzer/nagios-core"
 RDEPEND="${DEPEND}
 	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes"
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
 
 src_configure() {
 	econf \
@@ -36,16 +45,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install install-config || die "emake install failed"
 	doinitd "${FILESDIR}/npcd"
-}
-
-pkg_postinst() {
-	elog "To include the pnp webinterface into your Nagios setup you could use"
-	elog "an Alias in you Apache configuration as follows:"
+	rm "${D}/usr/share/pnp/install.php"
 
-	elog "\tAlias /nagios/pnp       /usr/share/pnp/"
-	elog "\t<Directory "/usr/share/pnp">"
-	elog "\t\tAllowOverride AuthConfig"
-	elog "\t\tOrder allow,deny"
-	elog "\t\tAllow from all"
-	elog "\t</Directory>"
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
 }