diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:49:17 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:49:17 +0200 |
| commit | d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956 (patch) | |
| tree | 53429d4faa2e696dd798515e2db493bc78ba5e48 /src/util/config.rs | |
| parent | d23b3a14fc28de164080e762f0e97e6cbc868940 (diff) | |
| parent | 03c40a0b24dd5bd2a51d3cd3df0ca1a42fb2d328 (diff) | |
| download | garage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.tar.gz garage-d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/util/config.rs')
| -rw-r--r-- | src/util/config.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/util/config.rs b/src/util/config.rs index a2bb8fb3..cccad101 100644 --- a/src/util/config.rs +++ b/src/util/config.rs @@ -77,11 +77,10 @@ pub struct Config { pub s3_api: S3ApiConfig, /// Configuration for K2V api - #[cfg(feature = "k2v")] pub k2v_api: Option<K2VApiConfig>, /// Configuration for serving files as normal web server - pub s3_web: WebConfig, + pub s3_web: Option<WebConfig>, /// Configuration for the admin API endpoint #[serde(default = "Default::default")] @@ -92,7 +91,7 @@ pub struct Config { #[derive(Deserialize, Debug, Clone)] pub struct S3ApiConfig { /// Address and port to bind for api serving - pub api_bind_addr: SocketAddr, + pub api_bind_addr: Option<SocketAddr>, /// S3 region to use pub s3_region: String, /// Suffix to remove from domain name to find bucket. If None, @@ -101,7 +100,6 @@ pub struct S3ApiConfig { } /// Configuration for K2V api -#[cfg(feature = "k2v")] #[derive(Deserialize, Debug, Clone)] pub struct K2VApiConfig { /// Address and port to bind for api serving |