Fix the default value of the home directory (#9711)
Change the default home to be VARLIB_DIR instead of CACHE_DIR so that it is consistent with the installation. Override the default with the HOME var if set in the environment.
Chris Akritidis committed
Aug 11, 2020 at 16:44 UTC
cedb8707c8ce1728984da85a58d24c26ddc24ad9
2 files changed
+3
-2
daemon/common.c
+1
-1
@@ -11,7 +11,7 @@ char *netdata_configured_web_dir = WEB_DIR;
11
char *netdata_configured_cache_dir = CACHE_DIR;
12
char *netdata_configured_varlib_dir = VARLIB_DIR;
13
char *netdata_configured_lock_dir = NULL;
14
-char *netdata_configured_home_dir = CACHE_DIR;
14
+char *netdata_configured_home_dir = VARLIB_DIR;
15
char *netdata_configured_host_prefix = NULL;
16
char *netdata_configured_timezone = NULL;
17
int netdata_ready;
daemon/main.c
+2
-1
@@ -541,7 +541,8 @@ static void get_netdata_configured_variables() {
541
netdata_configured_web_dir = config_get(CONFIG_SECTION_GLOBAL, "web files directory", netdata_configured_web_dir);
542
netdata_configured_cache_dir = config_get(CONFIG_SECTION_GLOBAL, "cache directory", netdata_configured_cache_dir);
543
netdata_configured_varlib_dir = config_get(CONFIG_SECTION_GLOBAL, "lib directory", netdata_configured_varlib_dir);
544
- netdata_configured_home_dir = config_get(CONFIG_SECTION_GLOBAL, "home directory", netdata_configured_home_dir);
544
+ char *env_home=getenv("HOME");
545
+ netdata_configured_home_dir = config_get(CONFIG_SECTION_GLOBAL, "home directory", env_home?env_home:netdata_configured_home_dir);
546
547
netdata_configured_lock_dir = initialize_lock_directory_path(netdata_configured_varlib_dir);
548