diff -Naur cacti-0.8.8a/cli/upgrade_database.php cacti-0.8.8a.dlucio/cli/upgrade_database.php
--- cacti-0.8.8a/cli/upgrade_database.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/cli/upgrade_database.php 2013-04-18 16:18:57.170270810 -0400
@@ -80,7 +80,7 @@
print "Your Cacti is already up to date.\n";
exit;
} else if ($old_cacti_version < 0.7) {
- print 'You are attempting to install cacti ' . $config['cacti_version'] . " onto a 0.6.x database.\nTo continue, you must create a new database, import 'cacti.sql' into it,\nand update 'include/config.php' to point to the new database.\n";
+ print 'You are attempting to install cacti ' . $config['cacti_version'] . " onto a 0.6.x database.\nTo continue, you must create a new database, import 'cacti.sql' into it,\nand update '/etc/cacti.conf' to point to the new database.\n";
exit;
} else if (empty($old_cacti_version)) {
print "You have created a new database, but have not yet imported the 'cacti.sql' file.\n";
diff -Naur cacti-0.8.8a/include/config.php cacti-0.8.8a.dlucio/include/config.php
--- cacti-0.8.8a/include/config.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/include/config.php 2013-04-18 16:21:32.793325254 -0400
@@ -39,6 +39,9 @@
//$url_path = "/cacti/";
/* Default session name - Session name must contain alpha characters */
-//$cacti_session_name = "Cacti";
+$cacti_session_name = "Cacti";
+$config["library_path"] = '/usr/share/cacti/lib';
+$config["rra_path"] = '/var/lib/cacti';
+$config['url_path'] = '/cacti/';
?>
diff -Naur cacti-0.8.8a/include/global.php cacti-0.8.8a.dlucio/include/global.php
--- cacti-0.8.8a/include/global.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/include/global.php 2013-04-18 16:22:12.057834381 -0400
@@ -46,7 +46,7 @@
$url_path = "/cacti/";
/* Include configuration */
-include(dirname(__FILE__) . "/config.php");
+include "/etc/cacti.conf";
if (isset($config["cacti_version"])) {
die("Invalid include/config.php file detected.");
diff -Naur cacti-0.8.8a/include/global_settings.php cacti-0.8.8a.dlucio/include/global_settings.php
--- cacti-0.8.8a/include/global_settings.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/include/global_settings.php 2013-04-18 16:25:06.160657796 -0400
@@ -98,7 +98,7 @@
"friendly_name" => "Cacti Log File Path",
"description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
"method" => "filepath",
- "default" => $config["base_path"] . "/log/cacti.log",
+ "default" => "/var/log/cacti/cacti.log",
"max_length" => "255"
),
"pollerpaths_header" => array(
diff -Naur cacti-0.8.8a/install/index.php cacti-0.8.8a.dlucio/install/index.php
--- cacti-0.8.8a/install/index.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/install/index.php 2013-04-18 16:26:38.630501764 -0400
@@ -49,7 +49,7 @@
print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
<p style='font-family: Verdana, Arial; font-size: 12px;'>You are attempting to install cacti " . $config["cacti_version"] . "
onto a 0.6.x database. To continue, you must create a new database, import 'cacti.sql' into it, and
- update 'include/config.php' to point to the new database.</p>";
+ update '/etc/cacti.conf' to point to the new database.</p>";
exit;
}elseif (empty($old_cacti_version)) {
print " <p style='font-family: Verdana, Arial; font-size: 16px; font-weight: bold; color: red;'>Error</p>
@@ -267,7 +267,7 @@
if (config_value_exists("path_cactilog")) {
$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
} else {
- $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
+ $input["path_cactilog"]["default"] = "/var/log/cacti/cacti.log";
}
/* SNMP Version */
@@ -533,7 +533,7 @@
</p>
<p>The following information has been determined from Cacti's configuration file.
- If it is not correct, please edit 'include/config.php' before continuing.</p>
+ If it is not correct, please edit '/etc/cacti.conf' before continuing.</p>
<p class="code">
<?php print "Database User: $database_username<br>";
diff -Naur cacti-0.8.8a/lib/database.php cacti-0.8.8a.dlucio/lib/database.php
--- cacti-0.8.8a/lib/database.php 2012-04-22 22:00:14.000000000 -0400
+++ cacti-0.8.8a.dlucio/lib/database.php 2013-04-18 16:27:07.004147044 -0400
@@ -58,7 +58,7 @@
usleep(40000);
}
- die("FATAL: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in 'include/config.php'\n");
+ die("FATAL: Cannot connect to MySQL server on '$host'. Please make sure you have specified a valid MySQL database name in '/etc/cacti.conf'\n");
return(0);
}
