diff options
| author |   Rob Holland <tigger@gentoo.org> | 2004-02-17 11:40:39 +0000 |
|---|---|---|
| committer | Rob Holland <tigger@gentoo.org> | 2004-02-17 11:40:39 +0000 |
| commit | 4ffdc1f6fabb9fb02621c072085c4442f8d8cf41 (patch) | |
| tree | a23afad58c41e0e88219b9b281407ec63ec854fc /net-analyzer/nagios-core | |
| parent | Added ~mips to keywords. (diff) | |
| download | historical-4ffdc1f6fabb9fb02621c072085c4442f8d8cf41.tar.gz historical-4ffdc1f6fabb9fb02621c072085c4442f8d8cf41.tar.bz2 historical-4ffdc1f6fabb9fb02621c072085c4442f8d8cf41.zip | |
Corrected apache2 handling and shell error.
Diffstat (limited to 'net-analyzer/nagios-core')
| -rw-r--r-- | net-analyzer/nagios-core/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index 0433e7d1b34b..de6d6789b944 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.18 2004/02/15 11:45:49 tigger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.19 2004/02/17 11:40:39 tigger Exp $ + + 17 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild: + Corrected apache2 handling and shell error. *nagios-core-1.1-r6 (15 Feb 2004) diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 4146787b368d..7d6257529e75 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,6 +1,6 @@ -MD5 d772302c96827a871ac128148fe1214b nagios-core-1.1-r6.ebuild 5884 +MD5 58c89f636cf758e1e41c37f0feee2f24 nagios-core-1.1-r6.ebuild 5885 MD5 3ded4ec4e85d53a021c13ac3c1733e1a nagios-core-1.1-r5.ebuild 5900 -MD5 c2cc8846352a80f2b6779f33e35f5183 ChangeLog 3286 +MD5 aadf8b8bfe628c29375eda05cd950768 ChangeLog 3407 MD5 b480a3a5ddac940e863a185f069a0cc0 metadata.xml 981 MD5 14229fd9200b237d116ae78912617726 nagios-core-1.1-r4.ebuild 5313 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362 diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild index 17204b312fe7..7d960dd02f24 100644 --- a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild +++ b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.2 2004/02/15 11:45:49 tigger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild,v 1.3 2004/02/17 11:40:39 tigger Exp $ inherit eutils @@ -162,7 +162,7 @@ pkg_postinst() { einfo " rc-update add nagios default" einfo - if [ -z "`use noweb`"]; then + if [ -z "`use noweb`" ]; then einfo "This does not include cgis that are perl-dependent" einfo "Currently traceroute.cgi is perl-dependent" einfo "To have ministatus.cgi requires copying of ministatus.c" @@ -171,17 +171,17 @@ pkg_postinst() { einfo "1. Execute the command:" einfo " \"ebuild /var/db/pkg/net-analyzer/${PF}/${PF}.ebuild config\"" - if [ -z "`use apache2`" ]; then + if [ -n "`use apache2`" ]; then insinto /etc/apache2/conf/modules.d doins ${FILESDIR}/99_nagios.conf - einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\"" + einfo " 2. Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" else insinto /etc/apache/conf/addon-modules doins ${FILESDIR}/nagios.conf echo "Include conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf - einfo " 2. Edit /etc/conf.d/apache2 and add \"-D NAGIOS\"" + einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\"" fi einfo |