From: Felix Ableitner <me@nutomic.com>
Date: Sat, 28 Dec 2019 11:11:06 +0000 (+0100)
Subject: Fix overriding config vars with underscore from environment
X-Git-Url: http://these/git/%7Bthis.props.banner%7D?a=commitdiff_plain;h=a3065ed39f871e251d2e3762219c78859cb51f06;p=lemmy.git

Fix overriding config vars with underscore from environment
---

diff --git a/README.md b/README.md
index fa35788d..143bfaa7 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,7 @@ into your local `config.hjson` file.
 
 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_PASSWORD=my_password`.
+`LEMMY__DATABASE__POOL_SIZE=10`.
 
 An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL connection string like
 `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection details at once.
diff --git a/server/src/settings.rs b/server/src/settings.rs
index 7da19c0f..446bf04f 100644
--- a/server/src/settings.rs
+++ b/server/src/settings.rs
@@ -70,7 +70,10 @@ impl Settings {
 
     // Add in settings from the environment (with a prefix of LEMMY)
     // Eg.. `LEMMY_DEBUG=1 ./target/app` would set the `debug` key
-    s.merge(Environment::with_prefix("LEMMY").separator("_"))?;
+    // Note: we need to use double underscore here, because otherwise variables containing
+    //       underscore cant be set from environmnet.
+    // https://github.com/mehcode/config-rs/issues/73
+    s.merge(Environment::with_prefix("LEMMY").separator("__"))?;
 
     return s.try_into();
   }