| 1 |
commit: 9211c22e7c5016ba72d98d115c2a8071e4a89534 |
| 2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Nov 14 06:56:40 2019 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 14 12:52:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9211c22e |
| 7 |
|
| 8 |
net-analyzer/nagios-core: fix cgi-bin path for apache |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/699002 |
| 11 |
Package-Manager: Portage-2.3.79, Repoman-2.3.17 |
| 12 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
| 13 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 14 |
|
| 15 |
net-analyzer/nagios-core/files/99_nagios4-r1.conf | 2 +- |
| 16 |
.../{nagios-core-4.4.5-r4.ebuild => nagios-core-4.4.5-r5.ebuild} | 6 +++--- |
| 17 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/nagios-core/files/99_nagios4-r1.conf b/net-analyzer/nagios-core/files/99_nagios4-r1.conf |
| 20 |
index 54531ed6275..8d080d5c17b 100644 |
| 21 |
--- a/net-analyzer/nagios-core/files/99_nagios4-r1.conf |
| 22 |
+++ b/net-analyzer/nagios-core/files/99_nagios4-r1.conf |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
<IfDefine NAGIOS> |
| 25 |
|
| 26 |
- ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@ |
| 27 |
+ ScriptAlias /nagios/cgi-bin @CGIBINDIR@ |
| 28 |
<Directory "@CGIBINDIR@"> |
| 29 |
AllowOverride AuthConfig |
| 30 |
Options ExecCGI |
| 31 |
|
| 32 |
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 |
| 33 |
similarity index 97% |
| 34 |
rename from net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild |
| 35 |
rename to net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild |
| 36 |
index 4a5ffee95d4..a1922298fa0 100644 |
| 37 |
--- a/net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild |
| 38 |
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild |
| 39 |
@@ -105,8 +105,8 @@ src_configure() { |
| 40 |
# The paths in the web server configuration files need to match |
| 41 |
# those passed to econf above. |
| 42 |
cp "${FILESDIR}/99_nagios4-r1.conf" \ |
| 43 |
- "${FILESDIR}/lighttpd_nagios4-r1.conf" \ |
| 44 |
- "${T}/" || die "failed to create copies of web server conf files" |
| 45 |
+ "${FILESDIR}/lighttpd_nagios4-r1.conf" \ |
| 46 |
+ "${T}/" || die "failed to create copies of web server conf files" |
| 47 |
|
| 48 |
sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \ |
| 49 |
-e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \ |
| 50 |
@@ -189,7 +189,7 @@ src_install() { |
| 51 |
if use apache2 ; then |
| 52 |
# Install the Nagios configuration file for Apache. |
| 53 |
insinto "/etc/apache2/modules.d" |
| 54 |
- doins "${T}/99_nagios4-r1.conf" |
| 55 |
+ newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf" |
| 56 |
elif use lighttpd ; then |
| 57 |
# Install the Nagios configuration file for Lighttpd. |
| 58 |
insinto /etc/lighttpd |
Archives