gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parameterize config file location 

Allows `config.hjson` to be located on a configurable path.
pull/1244/head
Kenneth Koski 2020-10-31 16:25:15 -05:00
parent fc36ae22c9
commit bfd8f52497
No known key found for this signature in database
GPG Key ID: 0B5640605A253F72
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lemmy_utils/src/settings.rs
View File

@ -93,7 +93,7 @@ impl Settings {
s.merge(File::with_name(&Self::get_config_defaults_location()))?;
s.merge(File::with_name(CONFIG_FILE).required(false))?;
s.merge(File::with_name(&Self::get_config_location()).required(false))?;
// Add in settings from the environment (with a prefix of LEMMY)
// Eg.. `LEMMY_DEBUG=1 ./target/app` would set the `debug` key
@ -122,11 +122,15 @@ impl Settings {
}
pub fn get_config_defaults_location() -> String {
env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE_DEFAULTS.to_string())
env::var("LEMMY_CONFIG_DEFAULTS_LOCATION").unwrap_or_else(|_| CONFIG_FILE_DEFAULTS.to_string())
}
pub fn get_config_location() -> String {
env::var("LEMMY_CONFIG_LOCATION").unwrap_or_else(|_| CONFIG_FILE.to_string())
}
pub fn read_config_file() -> Result<String, Error> {
fs::read_to_string(CONFIG_FILE)
fs::read_to_string(Self::get_config_location())
}
pub fn get_allowed_instances(&self) -> Vec<String> {