Imported Debian patch 0.8.7g-2.1
[debian/cacti] / debian / patches / 06_config_settings.php_cactid_path.patch
1 --- cacti.orig/include/global_settings.php
2 +++ cacti/include/global_settings.php
3 @@ -94,9 +94,9 @@ $settings = array(
4                         ),
5                 "path_cactilog" => array(
6                         "friendly_name" => "Cacti Log File Path",
7 -                       "description" => "The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)",
8 +                       "description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/cacti.log)",
9                         "method" => "filepath",
10 -                       "default" => $config["base_path"] . "/log/cacti.log",
11 +                       "default" => "/var/log/cacti/cacti.log",
12                         "max_length" => "255"
13                         ),
14                 "pollerpaths_header" => array(
15 @@ -105,8 +105,9 @@ $settings = array(
16                         ),
17                 "path_spine" => array(
18                         "friendly_name" => "Spine Poller File Path",
19 -                       "description" => "The path to Spine binary.",
20 +                       "description" => "The path to Spine binary (if blank, defaults to /usr/sbin/spine).",
21                         "method" => "filepath",
22 +                       "default" => "/usr/sbin/spine",
23                         "max_length" => "255"
24                         ),
25                 "extendedpaths_header" => array(
26 --- cacti.orig/include/global.php
27 +++ cacti/include/global.php
28 @@ -88,7 +88,7 @@ $config["php_snmp_support"] = function_e
29  $config["base_path"] = strtr(ereg_replace("(.*)[\\\/]include", "\\1", dirname(__FILE__)), "\\", "/");
30  $config["library_path"] = ereg_replace("(.*[\\\/])include", "\\1lib", dirname(__FILE__));
31  $config["include_path"] = dirname(__FILE__);
32 -$config["rra_path"] = $config["base_path"] . '/rra';
33 +$config["rra_path"] = '/var/lib/cacti/rra';
34  
35  /* colors */
36  $colors["dark_outline"] = "454E53";
37 --- cacti.orig/install/index.php
38 +++ cacti/install/index.php
39 @@ -264,7 +264,7 @@ $input["path_cactilog"]["description"] =
40  if (config_value_exists("path_cactilog")) {
41         $input["path_cactilog"]["default"] = read_config_option("path_cactilog");
42  } else {
43 -       $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
44 +       $input["path_cactilog"]["default"] = "/var/log/cacti/cacti.log";
45  }
46  
47  /* SNMP Version */