3 files changed, 14 insertions, 3 deletions

diff --git a/net-mgmt/cacti/files/patch-include__global_settings.php b/net-mgmt/cacti/files/patch-include__global_settings.php
index 509317198b79..fdbe9e527235 100644
--- a/net-mgmt/cacti/files/patch-include__global_settings.php
+++ b/net-mgmt/cacti/files/patch-include__global_settings.php
@@ -5,10 +5,10 @@
  		"path_cactilog" => array(
  			"friendly_name" => "Cacti Log File Path",
 -			"description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
-+			"description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti.log)",
++			"description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)",
  			"method" => "filepath",
 -			"default" => $config["base_path"] . "/log/cacti.log",
-+			"default" => "/var/log/cacti/cacti.log",
++			"default" => "/var/log/cacti/log",
  			"max_length" => "255"
  			),
  		"pollerpaths_header" => array(
diff --git a/net-mgmt/cacti/files/patch-install__index.php b/net-mgmt/cacti/files/patch-install__index.php
index 8b7070adaeba..d0f9c7ff974b 100644
--- a/net-mgmt/cacti/files/patch-install__index.php
+++ b/net-mgmt/cacti/files/patch-install__index.php
@@ -5,7 +5,7 @@
  	$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";
++	$input["path_cactilog"]["default"] = "/var/log/cacti/log";
  }
  
  /* SNMP Version */
diff --git a/net-mgmt/cacti/files/pkg-message.in b/net-mgmt/cacti/files/pkg-message.in
index 3c9270ce0882..6628eeccb8ec 100644
--- a/net-mgmt/cacti/files/pkg-message.in
+++ b/net-mgmt/cacti/files/pkg-message.in
@@ -67,6 +67,17 @@ NOTEs as of 10Aug2014:
       manage them using newsyslog.
    b) Cacti RRD files are now found under /var/db/cacti/rra.
 
+   If you have an existing Cacti installation these paths are also
+   found in Cacti's SQL database and MUST be updated. These two SQL
+   commands should do the trick:
+
+   UPDATE settings SET value='/var/log/cacti/log' \ 
+     WHERE name='path_cactilog';
+
+   UPDATE poller_item SET rrd_path=\
+     REPLACE(rrd_path,'/usr/local/share/cacti/rra','/var/db/cacti/rra') \
+     WHERE rrd_path REGEXP '^/usr/local/share/cacti/rra';
+
 2) The PERL paths in the Cacti PERL scripts have been updated to
    /usr/local/bin.