diff options
| author | Alex <alex@adnab.me> | 2023-10-19 09:33:12 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-10-19 09:33:12 +0000 |
| commit | 0215b114028c9a9987c1581e50820a42e069ffe5 (patch) | |
| tree | 5d388a9643d5474b914b7f261c72c21142d8c592 /src/garage/server.rs | |
| parent | e75fe2157d0973eb4320bbc87be5e54a1cb91a63 (diff) | |
| parent | 8599051c492d7df22305e4c65659395d9102955c (diff) | |
| download | garage-0215b114028c9a9987c1581e50820a42e069ffe5.tar.gz garage-0215b114028c9a9987c1581e50820a42e069ffe5.zip | |
Merge pull request 'Add support for specifying `rpc_secret_file`, `metrics_token_file` and `admin_token_file` using environment variables' (#643) from networkException/garage:token-file-env into main-0.8.x
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/643
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 3ad10b72..96ea900d 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -29,7 +29,7 @@ async fn wait_from(mut chan: watch::Receiver<bool>) { pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Error> { info!("Loading configuration..."); - let config = fill_secrets(read_config(config_file)?, secrets); + let config = fill_secrets(read_config(config_file)?, secrets)?; // ---- Initialize Garage internals ---- |