From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD1AC13997D for ; Thu, 14 Nov 2019 12:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16EFEE0831; Thu, 14 Nov 2019 12:57:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1F45E0831 for ; Thu, 14 Nov 2019 12:57:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43AC334CE46 for ; Thu, 14 Nov 2019 12:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC5F25FF for ; Thu, 14 Nov 2019 12:56:58 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1573735947.9211c22e7c5016ba72d98d115c2a8071e4a89534.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nagios-core/files/99_nagios4-r1.conf net-analyzer/nagios-core/nagios-core-4.4.5-r4.ebuild net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild X-VCS-Directories: net-analyzer/nagios-core/ net-analyzer/nagios-core/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 9211c22e7c5016ba72d98d115c2a8071e4a89534 X-VCS-Branch: master Date: Thu, 14 Nov 2019 12:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c4ebcdb-e1fa-4c1e-ae49-dfaeb1c85d99 X-Archives-Hash: d37f2eacface92d1fa15f6ea099a445b commit: 9211c22e7c5016ba72d98d115c2a8071e4a89534 Author: Tomas Mozes gmail com> AuthorDate: Thu Nov 14 06:56:40 2019 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Nov 14 12:52:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9211c22e 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 gmail.com> Signed-off-by: Michael Orlitzky gentoo.org> net-analyzer/nagios-core/files/99_nagios4-r1.conf | 2 +- .../{nagios-core-4.4.5-r4.ebuild => nagios-core-4.4.5-r5.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 54531ed6275..8d080d5c17b 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 @@ - ScriptAlias /nagios/cgi-bin/ @CGIBINDIR@ + ScriptAlias /nagios/cgi-bin @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 4a5ffee95d4..a1922298fa0 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