diff options
| author | Alex <alex@adnab.me> | 2024-01-15 16:41:50 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-15 16:41:50 +0000 |
| commit | 993ce74976cd07eec927460af11fa8328f51206d (patch) | |
| tree | f7b5eac5953039e7a6263a8586bec3024192bbc6 /src/garage/server.rs | |
| parent | ee7fe27d3d3cc473dcf9a4045b10a957382d4a7b (diff) | |
| parent | 97bae7213aa214022b68b65094c3e152826de408 (diff) | |
| download | garage-993ce74976cd07eec927460af11fa8328f51206d.tar.gz garage-993ce74976cd07eec927460af11fa8328f51206d.zip | |
Merge pull request '0.8.x: config: refactor secret sourcing' (#685) from secret-sourcing into main-0.8.x
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/685
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 96ea900d..25d4b845 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -15,9 +15,9 @@ use garage_web::WebServer; use garage_api::k2v::api_server::K2VApiServer; use crate::admin::*; +use crate::secrets::{fill_secrets, Secrets}; #[cfg(feature = "telemetry-otlp")] use crate::tracing_setup::*; -use crate::{fill_secrets, Secrets}; async fn wait_from(mut chan: watch::Receiver<bool>) { while !*chan.borrow() { |