From: Tomas Mozes <hydrapolic@gmail.com>
Date: Thu, 14 Nov 2019 06:56:40 +0000 (+0100)
Subject: net-analyzer/nagios-core: fix cgi-bin path for apache
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9211c22e7c5016ba72d98d115c2a8071e4a89534;p=gentoo.git

net-analyzer/nagios-core: fix cgi-bin path for apache

Bug: https://bugs.gentoo.org/699002
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
---

diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
index 54531ed6275b..8d080d5c17b1 100644
--- a/net-analyzer/nagios-core/files/99_nagios4-r1.conf
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf
@@ -1,6 +1,6 @@
 <IfDefine NAGIOS>
 
-  ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@
+  ScriptAlias /nagios/cgi-bin @CGIBINDIR@
   <Directory "@CGIBINDIR@">
     AllowOverride AuthConfig
     Options ExecCGI
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
similarity index 97%
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
index 4a5ffee95d4f..a1922298fa0f 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild
@@ -105,8 +105,8 @@ src_configure() {
 	# The paths in the web server configuration files need to match
 	# those passed to econf above.
 	cp "${FILESDIR}/99_nagios4-r1.conf" \
-	   "${FILESDIR}/lighttpd_nagios4-r1.conf" \
-	   "${T}/" || die "failed to create copies of web server conf files"
+		"${FILESDIR}/lighttpd_nagios4-r1.conf" \
+		"${T}/" || die "failed to create copies of web server conf files"
 
 	sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \
 		-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \
@@ -189,7 +189,7 @@ src_install() {
 		if use apache2 ; then
 			# Install the Nagios configuration file for Apache.
 			insinto "/etc/apache2/modules.d"
-			doins "${T}/99_nagios4-r1.conf"
+			newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf"
 		elif use lighttpd ; then
 			# Install the Nagios configuration file for Lighttpd.
 			insinto /etc/lighttpd