1 --- cacti-spine-0.8.7a/spine.h~ 2007-11-26 05:40:21.000000000 +0200
2 +++ cacti-spine-0.8.7a/spine.h 2008-10-05 05:33:49.545548298 +0300
4 #define MAX_SIMULTANEOUS_SCRIPTS 20
6 /* locations to search for the config file */
7 -#define CONFIG_PATHS 4
8 -#define CONFIG_PATH_1 ""
9 -#define CONFIG_PATH_2 "/etc/"
10 -#define CONFIG_PATH_3 "/etc/cacti/"
11 -#define CONFIG_PATH_4 "../etc/"
12 +#define CONFIG_PATHS 1
13 +#define CONFIG_PATH_1 "/etc/webapps/cacti/"
15 /* config file defaults */
16 #define DEFAULT_CONF_FILE "spine.conf"
17 #define DEFAULT_THREADS 5
18 #define DEFAULT_DB_HOST "localhost"
19 #define DEFAULT_DB_DB "cacti"
20 -#define DEFAULT_DB_USER "cactiuser"
21 -#define DEFAULT_DB_PASS "cactiuser"
22 +#define DEFAULT_DB_USER "mysql"
23 +#define DEFAULT_DB_PASS ""
24 #define DEFAULT_DB_PORT 3306
25 -#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log"
26 +#define DEFAULT_LOGFILE "/var/log/cacti/cacti.log"
27 #define DEFAULT_TIMEOUT 294000000
29 /* threads constants */
30 --- cacti-spine-0.8.7a/util.c~ 2007-11-26 05:40:21.000000000 +0200
31 +++ cacti-spine-0.8.7a/util.c 2008-10-05 05:35:03.349764684 +0300
33 STRNCOPY(set.dbpass, DEFAULT_DB_PASS);
35 STRNCOPY(config_paths[0], CONFIG_PATH_1);
36 - STRNCOPY(config_paths[1], CONFIG_PATH_2);
37 - STRNCOPY(config_paths[2], CONFIG_PATH_3);
38 - STRNCOPY(config_paths[3], CONFIG_PATH_4);
40 set.log_destination = LOGDEST_FILE;
42 --- cacti-spine-0.8.7a/spine.conf~ 2007-11-26 05:40:21.000000000 +0200
43 +++ cacti-spine-0.8.7a/spine.conf 2008-10-05 05:41:07.495832134 +0300
45 # | DB_User The user to access the database, typically 'cactiuser' |
46 # | DB_Pass The password for the Cacti user |
47 # +-------------------------------------------------------------------------+
53 \ No newline at end of file