From 3b7ed7caffdbedfd30b022b8e2b3f93a2b6a494a Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Tue, 12 Apr 2022 21:47:07 +0100 Subject: fix env config parsing (#295) * fix env config parsing * fmt --- atuin-server/Cargo.toml | 2 +- atuin-server/src/settings.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'atuin-server') diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml index 92fa0367..e1acc97b 100644 --- a/atuin-server/Cargo.toml +++ b/atuin-server/Cargo.toml @@ -16,7 +16,7 @@ chrono = { version = "0.4", features = ["serde"] } eyre = "0.6" uuid = { version = "0.8", features = ["v4"] } whoami = "1.1.2" -config = "0.12" +config = "0.13" serde_derive = "1.0.125" serde = "1.0.126" serde_json = "1.0.75" diff --git a/atuin-server/src/settings.rs b/atuin-server/src/settings.rs index 04799a77..ce00801f 100644 --- a/atuin-server/src/settings.rs +++ b/atuin-server/src/settings.rs @@ -38,7 +38,11 @@ impl Settings { .set_default("port", 8888)? .set_default("open_registration", false)? .set_default("db_uri", "default_uri")? - .add_source(Environment::with_prefix("atuin").separator("_")); + .add_source( + Environment::with_prefix("atuin") + .prefix_separator("_") + .separator("__"), + ); config_builder = if config_file.exists() { config_builder.add_source(ConfigFile::new( -- cgit v1.3.1