From e5d3e3a9c3e3257aaa5b1febd2893aa169c6c818 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 13 Jul 2020 11:33:48 -0400 Subject: [PATCH] Adding a configurable config location through an env var. (#960) * Adding a configurable config location through an env var. - Its `LEMMY_CONFIG_LOCATION` - Fixes #764 * Using a static for CONFIG_FILE again. * Make clippy happy --- docs/src/administration_configuration.md | 2 ++ server/lemmy_utils/src/settings.rs | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index 56448de46..cc4c56898 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -5,6 +5,8 @@ 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`. + 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 `database.password` with `LEMMY_DATABASE__POOL_SIZE=10`. diff --git a/server/lemmy_utils/src/settings.rs b/server/lemmy_utils/src/settings.rs index 2ce33f58c..0607974f9 100644 --- a/server/lemmy_utils/src/settings.rs +++ b/server/lemmy_utils/src/settings.rs @@ -1,6 +1,7 @@ use config::{Config, ConfigError, Environment, File}; use serde::Deserialize; use std::{fs, io::Error, net::IpAddr, sync::RwLock}; +use std::env; static CONFIG_FILE_DEFAULTS: &str = "config/defaults.hjson"; static CONFIG_FILE: &str = "config/config.hjson"; @@ -83,7 +84,7 @@ impl Settings { s.merge(File::with_name(CONFIG_FILE_DEFAULTS))?; - 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 @@ -115,12 +116,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 read_config_file() -> Result { - fs::read_to_string(CONFIG_FILE) + fs::read_to_string(Self::get_config_location()) } pub fn save_config_file(data: &str) -> Result { - fs::write(CONFIG_FILE, data)?; + fs::write(Self::get_config_location(), data)?; // Reload the new settings // From https://stackoverflow.com/questions/29654927/how-do-i-assign-a-string-to-a-mutable-static-variable/47181804#47181804