include/config.php -> include/config-sample.php

3 files changed, 20 insertions, 13 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 1863ca32ffa6..75da3a9c3c43 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.28 2004/08/17 09:55:11 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.29 2004/08/17 14:36:48 eldad Exp $
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r1.ebuild:
+  Moved include/config.php to include/config-sample.php, so we won't overwrite
+  old config.
 
 *cacti-0.8.5a-r1 (17 Aug 2004)
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 7a44c71f89e1..80d2ec200c9e 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 74fba8275fd8a227bbf31ba8dee8873a cacti-0.8.5a-r1.ebuild 4536
+MD5 3c5429026810fd126265aac06c4cdd93 cacti-0.8.5a-r1.ebuild 4654
 MD5 37f166bdab6b6aea120532c1f9fb87c4 cacti-0.8.5a.ebuild 4440
-MD5 0f41d61f8ec15f98ee2271f0b196a068 ChangeLog 3556
+MD5 f8627b49731a4bdfa31c39f589ae9e28 ChangeLog 3719
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a 64
 MD5 9921205d0e13d5948104d5de2e58d3ee files/cacti-0.8.5a-sql-injection.patch 625
@@ -11,7 +11,7 @@ MD5 44637d48edf68b76a472c70817449cd6 files/digest-cacti-0.8.5a-r1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBIdalT+MN7JbqCpMRApmTAJ9XzdQ/0eXQ86T1ikClGsIAJ6xcKwCfemCK
-hS7uinyTXR4HBThp+IwGg8M=
-=ERFx
+iD8DBQFBIhikT+MN7JbqCpMRAnzuAJ9wOqcTpF0pswvDhuSinQK3cKY0XwCeKF3T
+Vg0mgJ1U959lcuqWitKAvk8=
+=nDK2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild b/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild
index 7d968974077a..02809b5c8fdc 100644
--- a/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.5a-r1.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/cacti/cacti-0.8.5a-r1.ebuild,v 1.1 2004/08/17 09:55:11 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.5a-r1.ebuild,v 1.2 2004/08/17 14:36:48 eldad Exp $
 
 inherit eutils webapp-apache
 
@@ -49,6 +49,9 @@ src_install() {
 	rm docs/{README,CHANGELOG,CONTRIB}
 	rm LICENSE README
 
+	#Don't overwrite old config
+	mv include/config.php include/config-sample.php
+
 	#mv docs/manual .
 	rm -rf docs
 	rm -rf cactid
@@ -66,7 +69,7 @@ pkg_postinst() {
 	if [[ ${ver_installed} != ${PV} ]]
 	then
 		einfo
-		einfo "The cacti has been installed to ${INSTALL_DEST}"
+		einfo "The cacti has been installed to ${HTTPD_ROOT}${PN}"
 		einfo
 		einfo "Before cacti works you must upgrade the cacti database:"
 		einfo "1. Backup the old cacti database:"
@@ -76,8 +79,8 @@ pkg_postinst() {
 		einfo "3. Create the new cacti database"
 		einfo "  shell> mysqladmin --user=root create cacti"
 		einfo "4. Import the default cacti database:"
-		einfo "  shell> mysql cacti < ${INSTALL_DEST}/cacti.sql"
-		einfo "5. Edit ${INSTALL_DEST}/include/config.php."
+		einfo "  shell> mysql cacti < ${HTTPD_ROOT}${PN}/cacti.sql"
+		einfo "5. Edit ${HTTPD_ROOT}${PN}/include/config.php."
 		einfo " + Modify the MySQL user, password and database for your"
 		einfo "   cacti configuration."
 		einfo "		\$database_default = \"cacti\";"
@@ -101,18 +104,18 @@ pkg_postinst() {
 		einfo
 	else
 		einfo
-		einfo "The cacti has been copied to ${INSTALL_DEST}"
+		einfo "The cacti has been copied to ${HTTPD_ROOT}${PN}"
 		einfo
 		einfo "Before cacti works you must:"
 		einfo "1. Create the new cacti database"
 		einfo "  shell> mysqladmin --user=root create cacti"
 		einfo "2. Import the default cacti database:"
-		einfo "  shell> mysql cacti < ${INSTALL_DEST}/cacti.sql"
+		einfo "  shell> mysql cacti < ${HTTPD_ROOT}${PN}/cacti.sql"
 		einfo "3. Optional: Create a MySQL username and password for cacti."
 		einfo "  shell> mysql --user=root mysql"
 		einfo "  mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';"
 		einfo "  mysql> flush privileges;"
-		einfo "4. Edit ${INSTALL_DEST}/include/config.php."
+		einfo "4. Copy ${HTTPD_ROOT}${PN}/include/config-sample.php to config.php."
 		einfo " + Modify the MySQL user, password and database for your"
 		einfo "   cacti configuration."
 		einfo "		\$database_default = \"cacti\";"