projects / packages / cacti-spine.git / blame
| Commit | Line | Data |
|---|---|---|
| 632d1d1e ER |
1 | --- cacti-spine-0.8.7g/spine.h~ 2010-07-12 12:40:01.000000000 +0300 |
| 2 | +++ cacti-spine-0.8.7g/spine.h 2010-07-12 12:40:39.663780727 +0300 | |
| 3 | @@ -135,22 +135,19 @@ | |
| 4 | #define SPINE_FORK 0 | |
| a7b5aa62 ER |
5 | |
| 6 | /* locations to search for the config file */ | |
| 9d56b56e | 7 | -#define CONFIG_PATHS 4 |
| a7b5aa62 ER |
8 | -#define CONFIG_PATH_1 "" |
| 9 | -#define CONFIG_PATH_2 "/etc/" | |
| 9d56b56e ER |
10 | -#define CONFIG_PATH_3 "/etc/cacti/" |
| 11 | -#define CONFIG_PATH_4 "../etc/" | |
| a7b5aa62 ER |
12 | +#define CONFIG_PATHS 1 |
| 13 | +#define CONFIG_PATH_1 "/etc/webapps/cacti/" | |
| 14 | ||
| 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 | |
| 632d1d1e | 25 | #define DEFAULT_DB_PREG 0 |
| a7b5aa62 ER |
26 | -#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log" |
| 27 | +#define DEFAULT_LOGFILE "/var/log/cacti/cacti.log" | |
| 28 | #define DEFAULT_TIMEOUT 294000000 | |
| 29 | ||
| 30 | /* threads constants */ | |
| 31 | --- cacti-spine-0.8.7a/util.c~ 2007-11-26 05:40:21.000000000 +0200 | |
| 32 | +++ cacti-spine-0.8.7a/util.c 2008-10-05 05:35:03.349764684 +0300 | |
| 9d56b56e | 33 | @@ -462,9 +462,6 @@ |
| a7b5aa62 ER |
34 | STRNCOPY(set.dbpass, DEFAULT_DB_PASS); |
| 35 | ||
| 36 | STRNCOPY(config_paths[0], CONFIG_PATH_1); | |
| 37 | - STRNCOPY(config_paths[1], CONFIG_PATH_2); | |
| 38 | - STRNCOPY(config_paths[2], CONFIG_PATH_3); | |
| 9d56b56e ER |
39 | - STRNCOPY(config_paths[3], CONFIG_PATH_4); |
| 40 | ||
| a7b5aa62 ER |
41 | set.log_destination = LOGDEST_FILE; |
| 42 | } | |
| 632d1d1e ER |
43 | --- cacti-spine-0.8.7g/spine.conf.dist~ 2010-07-12 12:41:17.000000000 +0300 |
| 44 | +++ cacti-spine-0.8.7g/spine.conf.dist 2010-07-12 12:41:55.223780961 +0300 | |
| 45 | @@ -32,9 +32,9 @@ | |
| 46 | # | DB_PreG Set to 1 if you wish to work with older versions of | | |
| 47 | # | cacti 0.8.7. | | |
| a7b5aa62 ER |
48 | # +-------------------------------------------------------------------------+ |
| 49 | -DB_Host localhost | |
| 50 | -DB_Database cacti | |
| 51 | -DB_User cactiuser | |
| 52 | -DB_Pass cactiuser | |
| 53 | -DB_Port 3306 | |
| 632d1d1e | 54 | -DB_PreG 0 |
| a7b5aa62 ER |
55 | +#DB_Host localhost |
| 56 | +#DB_Database cacti | |
| 632d1d1e ER |
57 | +#DB_User cactiuser |
| 58 | +#DB_Pass cactiuser | |
| a7b5aa62 | 59 | +#DB_Port 3306 |
| 632d1d1e | 60 | +#DB_PreG 0 |