diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2019-11-14 07:56:40 +0100 |
|---|---|---|
| committer |   Michael Orlitzky <mjo@gentoo.org> | 2019-11-14 07:52:27 -0500 |
| commit | 9211c22e7c5016ba72d98d115c2a8071e4a89534 (patch) | |
| tree | 44d7679e918fb5be88d34402c1cd60ffd4867acf /net-analyzer/nagios-core | |
| parent | kde-misc/basket: Fix xdg-mime file installation and drop bogus code (diff) | |
| download | gentoo-9211c22e7c5016ba72d98d115c2a8071e4a89534.tar.gz gentoo-9211c22e7c5016ba72d98d115c2a8071e4a89534.tar.bz2 gentoo-9211c22e7c5016ba72d98d115c2a8071e4a89534.zip | |
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>
Diffstat (limited to 'net-analyzer/nagios-core')
| -rw-r--r-- | net-analyzer/nagios-core/files/99_nagios4-r1.conf | 2 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild (renamed from net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild) | 6 |
2 files changed, 4 insertions, 4 deletions
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 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 |