diff options
| -rw-r--r-- | net-analyzer/nagios-core/ChangeLog | 11 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 5 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf | 24 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild (renamed from net-analyzer/nagios-core/nagios-core-3.0.6.ebuild) | 6 |
4 files changed, 39 insertions, 7 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index d45696801694..477e690eaff2 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/nagios-core -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.135 2008/12/02 17:48:30 dertobi123 Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.136 2009/01/22 17:00:59 dertobi123 Exp $ + +*nagios-core-3.0.6-r1 (22 Jan 2009) + + 22 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> + +files/lighttpd_nagios3-r1.conf, -nagios-core-3.0.6.ebuild, + +nagios-core-3.0.6-r1.ebuild: + Require mod_alias in lighttpd config, #191675 *nagios-core-3.0.6 (02 Dec 2008) diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 8023e6394aec..4dbccdf37eb4 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -2,6 +2,7 @@ AUX 2.x-series-nsca.patch 767 RMD160 69c3916842953666037dcf258906c15a9ce0047a SH AUX 99_nagios.conf 350 RMD160 d9818e29cd119b2cc185c75dcd374b3851eaa739 SHA1 fa4b438c1d06f2d00cd2bff4fefc448a59d1cdec SHA256 2e8448d5e38969f0eee4306611e9592e9cec93506ad055cd27ef8e211cfe9f71 AUX 99_nagios3.conf 377 RMD160 79f66fc0ae78fb856bd38ba479dbc8af4c2cf989 SHA1 cc2b21a6dec8c15641100284c66d95c2996da687 SHA256 0bfa88db78ab036d177c68da20a8fd2f567ba8c9f54c14cfb8e1fc121641051b AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a +AUX lighttpd_nagios3-r1.conf 482 RMD160 ec8c04a951f9cab2f9561fd224c4771fcb328158 SHA1 2e6a0d8d1290db425435f2613e48efa92d201455 SHA256 0cbe138afb954ee434dd3ea3146fc0677533085c2f2f8fa7faebe0bb3a64e172 AUX lighttpd_nagios3.conf 450 RMD160 598161a27cda2de96e9ec1b373edd7531fd64374 SHA1 237a6951ba1f95cf2c927ae87dfb40d746b8da87 SHA256 2606230d0d00c44c8a0100e2d9dac8ce88a6540fd7fe30f2ac6d274a349bb59e AUX nagios 1459 RMD160 522be9fa5e31accbba9778ced996e23e6c261284 SHA1 8d8cf21a2e1c4e6b4ba52aa5db2e30b71798afa5 SHA256 beb6682352f42496ed527c7d60b33d0e9c3d1e74681a013dc73d128a0139acb1 AUX nagios3 1441 RMD160 b0b9361c9e4515904ebf1b41ac0be557f59e7a96 SHA1 5351b5d19c0ba51555fc3d7436290006a3acc59d SHA256 e92406af772d1dfc352a476af5cc6c57483f3796d663f1f63c52b44738284644 @@ -9,6 +10,6 @@ DIST nagios-2.0b.cfg-sample.gz 8990 RMD160 5c1f02e13351f46214d032936dd1ecef3c244 DIST nagios-2.12.tar.gz 1742179 RMD160 b44e49166441735473450ba555137c695cc50920 SHA1 d3e8e3419f751c66a29775bb5280cec662d26a29 SHA256 d1bd812793bff2b3bac15ef72ceff788bd6c2ead4952cb1f19c6232fd3c497cd DIST nagios-3.0.6.tar.gz 2735504 RMD160 1c2b026b4dc5095f2419d239042b75200db1b95f SHA1 d6bd20cdc22d2b931f9ad7f9cb33ff71d2cb7d71 SHA256 bedeb2c1ffbf7525ec19ac84a66bad60a19d2b0544cbf050a53bfc363c09bb22 EBUILD nagios-core-2.12.ebuild 6719 RMD160 d8dbabbce75d22a7264cc1a61dee505865b5131a SHA1 37c2aff853a2fe3289ed6d1e21729932da3234ed SHA256 aa163f37b1eeaa0f0ea5da691c172c4be4a126aa2a3390837ed5a9fd6b077445 -EBUILD nagios-core-3.0.6.ebuild 6309 RMD160 0b042859b1b7d52ecdebaadcac2ad5ee2ab962e6 SHA1 7fba113a0404bd21017cd33cf0dc8b7a9b8a7a13 SHA256 780f5d4218898ea6e65d40e6b07ab4a18ea35cd0c859e6be1ab0a11f60ec6d69 -MISC ChangeLog 23404 RMD160 8b27cb2f83fbed700eb87395cba09a572282be44 SHA1 de3bb2674b856994170b7355799642053b2f1404 SHA256 c4bffaf127d74ff02788238c7e3ff2fc67d5cbb5c656715b7f3d6bf77f7c9f5e +EBUILD nagios-core-3.0.6-r1.ebuild 6315 RMD160 f617bf1c8df72f399d3fe7a3fc850288eb4d2180 SHA1 140754a65f981ea343ddef39cc8ad0d8204e3bc8 SHA256 1a9f06d38be3dc4efecd674697bd8d8e090abfc9be7147d80926bb285dff48cf +MISC ChangeLog 23640 RMD160 51c990d4181c042100a9a029ebe6a9b8b88ef391 SHA1 5305963209cea9fcc1789867f9b4189b00eea2e1 SHA256 bf0808bec7459db692cc53326ca42165684b597f5224287c37ebc47b32d52d65 MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81 diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf new file mode 100644 index 000000000000..6e2577029aca --- /dev/null +++ b/net-analyzer/nagios-core/files/lighttpd_nagios3-r1.conf @@ -0,0 +1,24 @@ +server.modules += ("mod_cgi") +server.modules += ("mod_auth") +server.modules += ("mod_alias") + +auth.require += ( "/nagios" => + ( + "method" => "digest", + "realm" => "nagios", + "require" => "valid-user" + ) +) + +$HTTP["url"] =~ "^/nagios/cgi-bin/" { + dir-listing.activate = "disable" + cgi.assign = ( + ".pl" => "/usr/bin/perl", + ".cgi" => "" + ) +} + +alias.url += ( + "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", + "/nagios" => "/usr/share/nagios/htdocs" +) diff --git a/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild index 0b96988b6acb..df9271f746cc 100644 --- a/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild +++ b/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.6.ebuild,v 1.1 2008/12/02 17:48:30 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.6-r1.ebuild,v 1.1 2009/01/22 17:00:59 dertobi123 Exp $ EAPI="1" @@ -123,7 +123,7 @@ src_install() { doins "${FILESDIR}"/99_nagios3.conf elif use lighttpd ; then insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios3.conf" nagios.conf + newins "${FILESDIR}/lighttpd_nagios3-r1.conf" nagios.conf else ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" ewarn "out-of-the-box. Since you are not using one of them, you" |