]>
Commit | Line | Data |
---|---|---|
caa81993 ER |
1 | --- cacti-0.8.7b/include/global.php 2008-10-05 04:38:29.740276226 +0300 |
2 | +++ cacti-0.8.7g/include/global.php 2010-12-13 12:10:44.312310245 +0200 | |
81fd7803 AM |
3 | @@ -65,7 +65,7 @@ $url_path = '/cacti/'; |
4 | ini_set('max_input_vars', '5000'); | |
caa81993 ER |
5 | |
6 | /* Include configuration */ | |
81fd7803 | 7 | -include(dirname(__FILE__) . '/config.php'); |
caa81993 ER |
8 | +require '/etc/webapps/cacti/config.php'; |
9 | ||
81fd7803 AM |
10 | if (isset($config['cacti_version'])) { |
11 | die('Invalid include/config.php file detected.'); | |
12 | @@ -139,7 +139,8 @@ if ($config['cacti_server_os'] == 'win32 | |
13 | $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); | |
14 | } | |
15 | $config['include_path'] = dirname(__FILE__); | |
16 | -$config['rra_path'] = $config['base_path'] . '/rra'; | |
219fa6fd | 17 | +$config["rra_path"] = '/var/lib/cacti/rra'; |
81fd7803 | 18 | +$config["path_cactilog"] = '/var/log/cacti/cacti.log'; |
6d075ceb | 19 | |
81fd7803 AM |
20 | /* for multiple pollers, we need to know this location */ |
21 | if (!isset($scripts_path)) { | |
caa81993 ER |
22 | --- cacti-0.8.7g/include/config.php~ 2010-12-13 12:15:08.000000000 +0200 |
23 | +++ cacti-0.8.7g/include/config.php 2010-12-13 12:16:09.275611204 +0200 | |
81fd7803 AM |
24 | @@ -27,8 +27,8 @@ |
25 | $database_type = 'mysql'; | |
26 | $database_default = 'cacti'; | |
27 | $database_hostname = 'localhost'; | |
28 | -$database_username = 'cactiuser'; | |
29 | -$database_password = 'cactiuser'; | |
30 | +$database_username = 'mysql'; | |
31 | +$database_password = ''; | |
32 | $database_port = '3306'; | |
33 | $database_ssl = false; | |
34 | ||
35 | --- cacti/poller.php~ 2017-08-28 05:48:36.000000000 +0200 | |
36 | +++ cacti/poller.php 2017-08-31 08:39:19.780902180 +0200 | |
37 | @@ -61,7 +61,7 @@ if (!isset($_SERVER['argv'][0]) || isset | |
6d075ceb ER |
38 | } |
39 | ||
156a14ed | 40 | /* start initialization section */ |
81fd7803 | 41 | -include(dirname(__FILE__) . '/include/global.php'); |
156a14ed | 42 | +require "/usr/share/cacti/include/global.php"; |
81fd7803 AM |
43 | include_once($config['base_path'] . '/lib/poller.php'); |
44 | include_once($config['base_path'] . '/lib/data_query.php'); | |
45 | include_once($config['base_path'] . '/lib/rrd.php'); | |
46 |