105 lines
4.4 KiB
Diff
105 lines
4.4 KiB
Diff
--- include/config.php.orig 2006-01-13 14:44:09.000000000 -0600
|
|
+++ include/config.php 2006-01-13 14:44:23.000000000 -0600
|
|
@@ -23,15 +23,7 @@
|
|
| - raXnet - http://www.raxnet.net/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
-
|
|
-/* make sure these values refect your actual database/host/user/password */
|
|
-$database_type = "mysql";
|
|
-$database_default = "cacti";
|
|
-$database_hostname = "localhost";
|
|
-$database_username = "cactiuser";
|
|
-$database_password = "cactiuser";
|
|
-$database_port = "3306";
|
|
-
|
|
+require_once("db.php");
|
|
/* ----- you probably do not need to change anything below this line ----- */
|
|
|
|
/* Files that do not need http header information - Command line scripts */
|
|
--- include/db.php.orig 1969-12-31 18:00:00.000000000 -0600
|
|
+++ include/db.php 2006-01-13 15:14:07.000000000 -0600
|
|
@@ -0,0 +1,9 @@
|
|
+<?
|
|
+/* make sure these values refect your actual database/host/user/password */
|
|
+$database_type = "mysql";
|
|
+$database_default = "cacti";
|
|
+$database_hostname = "localhost";
|
|
+$database_username = "cactiuser";
|
|
+$database_password = "cactiuser";
|
|
+$database_port = "3306";
|
|
+?>
|
|
--- docs/text/manual.txt.orig 2006-01-13 15:21:40.000000000 -0600
|
|
+++ docs/text/manual.txt 2006-01-13 15:22:42.000000000 -0600
|
|
@@ -144,7 +144,7 @@
|
|
mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somep
|
|
assword';
|
|
mysql> flush privileges;
|
|
- 5. Edit include/config.php and specify the MySQL user,
|
|
+ 5. Edit /etc/cacti/db.php and specify the MySQL user,
|
|
password and database for your Cacti configuration.
|
|
$database_default = "cacti";
|
|
$database_hostname = "localhost";
|
|
@@ -379,7 +379,7 @@
|
|
all the DLL files and sh.exe from the c:\cacti directory.
|
|
|
|
Configure Cacti
|
|
- 1. Edit cacti_web_root/cacti/include/config.php and specify
|
|
+ 1. Edit cacti_web_root/cacti/include/db.php and specify
|
|
the MySQL user, password, database, and database port for
|
|
your Cacti configuration.
|
|
$database_default = "cacti";
|
|
@@ -504,7 +504,7 @@
|
|
shell> tar xzvf cacti-version.tar.gz
|
|
4. Rename the new Cacti directory to match the old one.
|
|
shell> mv cacti-version cacti
|
|
- 5. Edit include/config.php and specify the MySQL user,
|
|
+ 5. Edit /etc/cacti/db.php and specify the MySQL user,
|
|
password and database for your Cacti configuration.
|
|
$database_default = "cacti";
|
|
$database_hostname = "localhost";
|
|
--- ./docs/UPGRADE.orig 2006-01-13 15:32:34.000000000 -0600
|
|
+++ ./docs/UPGRADE 2006-01-13 15:35:37.000000000 -0600
|
|
@@ -21,7 +21,7 @@
|
|
|
|
shell> mv cacti-version cacti
|
|
|
|
- 5. Edit include/config.php and specify the MySQL user, password and
|
|
+ 5. Edit /etc/cacti/db.php and specify the MySQL user, password and
|
|
database for your Cacti configuration.
|
|
|
|
$database_default = "cacti";
|
|
--- ./docs/INSTALL.orig 2006-01-13 15:32:45.000000000 -0600
|
|
+++ ./docs/INSTALL 2006-01-13 15:35:46.000000000 -0600
|
|
@@ -19,7 +19,7 @@
|
|
mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
|
|
mysql> flush privileges;
|
|
|
|
- 5. Edit include/config.php and specify the MySQL user, password and
|
|
+ 5. Edit /etc/cacti/db.php and specify the MySQL user, password and
|
|
database for your Cacti configuration.
|
|
|
|
$database_default = "cacti";
|
|
--- ./docs/html/upgrade.html.orig 2006-01-13 15:32:22.000000000 -0600
|
|
+++ ./docs/html/upgrade.html 2006-01-13 15:35:18.000000000 -0600
|
|
@@ -67,7 +67,7 @@
|
|
</li>
|
|
|
|
<li>
|
|
- <p>Edit <tt class="FILENAME">include/config.php</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
|
|
+ <p>Edit <tt class="FILENAME">/etc/cacti/db.php</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
|
|
<pre class="SCREEN">
|
|
<kbd class="USERINPUT">$database_default = "cacti";
|
|
$database_hostname = "localhost";
|
|
--- ./docs/html/install_unix.html.orig 2006-01-13 15:32:28.000000000 -0600
|
|
+++ ./docs/html/install_unix.html 2006-01-13 15:35:26.000000000 -0600
|
|
@@ -67,7 +67,7 @@
|
|
</li>
|
|
|
|
<li>
|
|
- <p>Edit <tt class="FILENAME">include/config.php</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
|
|
+ <p>Edit <tt class="FILENAME">/etc/cacti/db.php</tt> and specify the MySQL user, password and database for your Cacti configuration.</p>
|
|
<pre class="SCREEN">
|
|
<kbd class="USERINPUT">$database_default = "cacti";
|
|
$database_hostname = "localhost";
|