Bug 699002 – net-analyzer/nagios-core USE="apache web": prepare for 17.1 profile

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Tomáš Mózes 2019-10-31 08:29:52 UTC]

Currently we ship a static 99_nagios4.conf that won't work on 17.1 profile as the cgi-bin is in /usr/lib64 on adm64.

<IfDefine NAGIOS>
  ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
  <Directory "/usr/lib/nagios/cgi-bin/">
    AllowOverride AuthConfig
    Options ExecCGI
    Require all granted
  </Directory>

[Comment 1 Tomáš Mózes 2019-10-31 08:42:41 UTC]

Seems like the same applies to lighttpd.

[Comment 2 Michael Orlitzky 2019-10-31 14:05:43 UTC]

I don't think there's an elegant way to include those conf files upstream, so we'll probably wind up replacing "/usr/lib" with "@LIBDIR@" and then substituting the real value in with sed in src_prepare.

[Comment 3 Tomáš Mózes 2019-10-31 20:26:58 UTC]

I think that will be good enough.

[Comment 4 Larry the Git Cow 2019-11-05 17:44:33 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d689dbb5a8783f717d85f10344bf24991e557e1

commit 1d689dbb5a8783f717d85f10344bf24991e557e1
Author:     Michael Orlitzky <[e-mail]>
AuthorDate: 2019-11-03 00:26:57 +0000
Commit:     Michael Orlitzky <[e-mail]>
CommitDate: 2019-11-05 17:43:19 +0000

    net-analyzer/nagios-core: synchronize econf and web server paths.
    
    The nagios ./configure script takes two custom "cgibindir" and
    "webdir" paths that tell it where to put its CGI files and public
    document root. The web server configuration files that we ship also
    need to know these paths, which normally wouldn't be a problem, except
    that they involve a call to $(get_libdir).
    
    There doesn't seem to be an elegant place to upstream these conf files
    (which are Gentoo-specific), so we adopt the next-best solution: use
    @CGIBINDIR@ and @WEBDIR@ as placeholders, and then replace them with
    sed in src_configure().
    
    For consistency with the PMS definition of econf, these paths (and all
    others) now have EPREFIX prepended.
    
    Closes: https://bugs.gentoo.org/699002
    Package-Manager: Portage-2.3.76, Repoman-2.3.16
    Signed-off-by: Michael Orlitzky <[e-mail]>

 net-analyzer/nagios-core/files/99_nagios4-r1.conf  |  16 ++
 .../nagios-core/files/lighttpd_nagios4-r1.conf     |  15 ++
 .../nagios-core/nagios-core-4.4.5-r4.ebuild        | 245 +++++++++++++++++++++
 3 files changed, 276 insertions(+)

[Comment 5 Tomáš Mózes 2019-11-06 03:24:14 UTC]

Thanks Michael

[Comment 6 Larry the Git Cow 2019-11-14 12:56:58 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9211c22e7c5016ba72d98d115c2a8071e4a89534

commit 9211c22e7c5016ba72d98d115c2a8071e4a89534
Author:     Tomas Mozes <[e-mail]>
AuthorDate: 2019-11-14 06:56:40 +0000
Commit:     Michael Orlitzky <[e-mail]>
CommitDate: 2019-11-14 12:52:27 +0000

    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 <[e-mail]>
    Signed-off-by: Michael Orlitzky <[e-mail]>

 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(-)