Added an einfo about sample-configs. Closes #69415.

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 9f232aa3853f0fc8a7d410e9278933a83d6a8676..e508ac597cb504fb5f5900299e149b267cc7474d 100644 (file)
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.43 2004/10/25 03:03:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.44 2004/10/29 19:58:52 eldad Exp $
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild:
+  Added an einfo about sample-configs. Closes #69415.
 
   24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-core-1.2-r2.ebuild:
   Stable on sparc.

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 557d1ba8e4f5b53bad20f1f7aae703354a8c85e4..515ae42c5be7b5d34e33b2fc0b8b0cb8577d7876 100644 (file)
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,15 +1,25 @@
-MD5 5591760458adb027016d45f1baa6eba8 ChangeLog 7560
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ec1f8e3e0757da4a5c760f407b123bc1 nagios-core-1.2-r3.ebuild 7091
+MD5 b2b5a4982c7a888addfc7c5bb2ec173e nagios-core-1.2-r2.ebuild 6619
+MD5 420deb8860eb27f3377d5a7fdfd719dc ChangeLog 7716
 MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
-MD5 f06a700938f5657e469ed03ae688305f nagios-core-1.2-r3.ebuild 7204
-MD5 6c3ef94496284cf04a6756a6a94af672 nagios-core-1.2-r2.ebuild 6730
 MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669
-MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
-MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 e3466b42fdda5db64dc469a93f5c39e4 files/nagios 1395
-MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
-MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBgqChT+MN7JbqCpMRAkbNAKCMe1mwtOq1FLQezE6QE8RBjHl7xACeOfpI
+3IjzK+in4IeuLkFg4DyqxjE=
+=fzD0
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
index 0e19893aacd390935ae1a349821db0d5b9b442de..34916c2a882048029d9e7d2bb97b08b726b5c928 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.10 2004/10/25 03:03:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.11 2004/10/29 19:58:52 eldad Exp $
 
 inherit eutils
 
@@ -170,9 +170,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       einfo "Sample config files installed by default will always"
-       einfo "include cgi.cfg"
-       einfo "The sample configs can be found in /usr/share/doc/${PF}/sample-configs/"
+       keepdir /etc/nagios
 
        enewgroup nagios
 
@@ -192,7 +190,8 @@ pkg_preinst() {
 
 pkg_postinst() {
        einfo
-       einfo "Remember to edit the config files in /etc/nagios"
+       einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
+       einfo
        einfo "Also, if you want nagios to start at boot time"
        einfo "remember to execute:"
        einfo "  rc-update add nagios default"

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
index 2b98e5464b94bcfed7a81c0ad1b438dfd4a429d8..92fa3d68e2dd6c88fba4b43958454a168412249f 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.5 2004/10/22 10:47:01 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.6 2004/10/29 19:58:52 eldad Exp $
 
 inherit eutils
 
@@ -177,10 +177,7 @@ src_install() {
 }
 
 pkg_preinst() {
-       einfo "Sample config files installed by default will always"
-       einfo "include cgi.cfg"
-       einfo "The sample configs can be found in /usr/share/doc/${PF}/sample-configs/"
-
+       keepdir /etc/nagios
        keepdir /var/nagios
        keepdir /var/nagios/archives
        keepdir /usr/nagios/share/ssi
@@ -200,7 +197,8 @@ pkg_preinst() {
 
 pkg_postinst() {
        einfo
-       einfo "Remember to edit the config files in /etc/nagios"
+       einfo "The example config files are located at /usr/share/doc/${P}/sample-configs/."
+       einfo
        einfo "Also, if you want nagios to start at boot time"
        einfo "remember to execute:"
        einfo "  rc-update add nagios default"