From 01cc8654e27293c4080b73913456cc37826ee653 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 22 Jul 2020 20:17:41 -0400 Subject: [PATCH] Fixing config_file env to use defaults instead (since its required). (#970) * Fixing config_file env to use defaults instead (since its required). Fixes #764 * Changing the read / write to the custom config file one * Adding a config note. --- docs/src/administration_configuration.md | 2 +- server/lemmy_utils/src/settings.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index c2aef3f7..ce9dc2ba 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -5,7 +5,7 @@ The configuration is based on the file This file also contains documentation for all the available options. To override the defaults, you can copy the options you want to change into your local `config.hjson` file. -To use a different `config.hjson` location than the current directory, set the environment variable `LEMMY_CONFIG_LOCATION`. +To use a different `config.hjson` location than the current directory, set the environment variable `LEMMY_CONFIG_LOCATION`. Make sure you copy the `defaults.hjson` if you do this, otherwise you will be missing settings. Additionally, you can override any config files with environment variables. These have the same name as the config options, and are prefixed with `LEMMY_`. For example, you can override the diff --git a/server/lemmy_utils/src/settings.rs b/server/lemmy_utils/src/settings.rs index 097063b6..10291477 100644 --- a/server/lemmy_utils/src/settings.rs +++ b/server/lemmy_utils/src/settings.rs @@ -81,9 +81,9 @@ impl Settings { fn init() -> Result { let mut s = Config::new(); - s.merge(File::with_name(CONFIG_FILE_DEFAULTS))?; + s.merge(File::with_name(&Self::get_config_defaults_location()))?; - s.merge(File::with_name(&Self::get_config_location()).required(false))?; + s.merge(File::with_name(CONFIG_FILE).required(false))?; // Add in settings from the environment (with a prefix of LEMMY) // Eg.. `LEMMY_DEBUG=1 ./target/app` would set the `debug` key @@ -115,16 +115,16 @@ impl Settings { format!("{}/api/v1", self.hostname) } - pub fn get_config_location() -> String { - env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE.to_string()) + pub fn get_config_defaults_location() -> String { + env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE_DEFAULTS.to_string()) } pub fn read_config_file() -> Result { - fs::read_to_string(Self::get_config_location()) + fs::read_to_string(CONFIG_FILE) } pub fn save_config_file(data: &str) -> Result { - fs::write(Self::get_config_location(), data)?; + fs::write(CONFIG_FILE, data)?; // Reload the new settings // From https://stackoverflow.com/questions/29654927/how-do-i-assign-a-string-to-a-mutable-static-variable/47181804#47181804 -- 2.44.1