cacti-spine-paths.patch

   1 diff -urNp -x '*.orig' cacti-spine-1.2.16.org/spine.conf.dist cacti-spine-1.2.16/spine.conf.dist
   2 --- cacti-spine-1.2.16.org/spine.conf.dist      2020-11-30 19:21:59.000000000 +0100
   3 +++ cacti-spine-1.2.16/spine.conf.dist  2022-02-09 22:10:49.918624593 +0100
   4 @@ -40,11 +40,11 @@
   5  # | RDB_Pass        The remote database password.                           |
   6  # +-------------------------------------------------------------------------+
   7
   8 -DB_Host       localhost
   9 -DB_Database   cacti
  10 -DB_User       cactiuser
  11 -DB_Pass       cactiuser
  12 -DB_Port       3306
  13 +#DB_Host       localhost
  14 +#DB_Database   cacti
  15 +#DB_User       cactiuser
  16 +#DB_Pass       cactiuser
  17 +#DB_Port       3306
  18  #DB_UseSSL    0
  19  #DB_SSL_Key
  20  #DB_SSL_Cert
  21 diff -urNp -x '*.orig' cacti-spine-1.2.16.org/spine.h cacti-spine-1.2.16/spine.h
  22 --- cacti-spine-1.2.16.org/spine.h      2020-11-30 19:21:59.000000000 +0100
  23 +++ cacti-spine-1.2.16/spine.h  2022-02-09 22:10:49.918624593 +0100
  24 @@ -148,22 +148,19 @@
  25  #define SPINE_FORK 0
  26
  27  /* locations to search for the config file */
  28 -#define CONFIG_PATHS 4
  29 -#define CONFIG_PATH_1 ""
  30 -#define CONFIG_PATH_2 "/etc/"
  31 -#define CONFIG_PATH_3 "/etc/cacti/"
  32 -#define CONFIG_PATH_4 "../etc/"
  33 +#define CONFIG_PATHS 1
  34 +#define CONFIG_PATH_1 "/etc/webapps/cacti/"
  35
  36  /* config file defaults */
  37  #define DEFAULT_CONF_FILE "spine.conf"
  38  #define DEFAULT_THREADS 5
  39  #define DEFAULT_DB_HOST "localhost"
  40  #define DEFAULT_DB_DB "cacti"
  41 -#define DEFAULT_DB_USER "cactiuser"
  42 -#define DEFAULT_DB_PASS "cactiuser"
  43 +#define DEFAULT_DB_USER "mysql"
  44 +#define DEFAULT_DB_PASS ""
  45  #define DEFAULT_DB_PORT 3306
  46  #define DEFAULT_DB_PREG 0
  47 -#define DEFAULT_LOGFILE "/var/www/html/cacti/log/cacti.log"
  48 +#define DEFAULT_LOGFILE "/var/log/cacti/cacti.log"
  49  #define DEFAULT_TIMEOUT 294000000
  50
  51  /* threads constants */
  52 diff -urNp -x '*.orig' cacti-spine-1.2.16.org/util.c cacti-spine-1.2.16/util.c
  53 --- cacti-spine-1.2.16.org/util.c       2020-11-30 19:21:59.000000000 +0100
  54 +++ cacti-spine-1.2.16/util.c   2022-02-09 22:10:49.918624593 +0100
  55 @@ -957,9 +957,6 @@ void config_defaults() {
  56         STRNCOPY(set.rdb_pass, DEFAULT_DB_PASS);
  57
  58         STRNCOPY(config_paths[0], CONFIG_PATH_1);
  59 -       STRNCOPY(config_paths[1], CONFIG_PATH_2);
  60 -       STRNCOPY(config_paths[2], CONFIG_PATH_3);
  61 -       STRNCOPY(config_paths[3], CONFIG_PATH_4);
  62
  63         set.log_destination = LOGDEST_FILE;
  64  }