diff options
| author | Alex <alex@adnab.me> | 2022-10-18 20:20:55 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2022-10-18 20:20:55 +0000 |
| commit | 52547506586c10cd8200fbdf6112dd53663e5200 (patch) | |
| tree | 3ea0cd34ae65c037ebb51a35fd83c71912f2c9e2 /src/garage | |
| parent | 5670599372f6c3c60dcd74279a0741248fc510c3 (diff) | |
| parent | 57b5c2c754a8d6d55882eae3dad44e328d961084 (diff) | |
| download | garage-52547506586c10cd8200fbdf6112dd53663e5200.tar.gz garage-52547506586c10cd8200fbdf6112dd53663e5200.zip | |
Merge pull request 'Add TLS support for Consul discovery + refactoring' (#405) from consul-tls into mainv0.8.0-rc2v0.8-rc2
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/405
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/garage/main.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index ddc23170..cbc0dc61 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -81,6 +81,8 @@ sled = [ "garage_model/sled" ] lmdb = [ "garage_model/lmdb" ] sqlite = [ "garage_model/sqlite" ] +# Automatic registration and discovery via Consul API +consul-discovery = [ "garage_rpc/consul-discovery" ] # Automatic registration and discovery via Kubernetes API kubernetes-discovery = [ "garage_rpc/kubernetes-discovery" ] # Prometheus exporter (/metrics endpoint). diff --git a/src/garage/main.rs b/src/garage/main.rs index e5cba553..5b2a85c0 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -90,6 +90,8 @@ async fn main() { "lmdb", #[cfg(feature = "sqlite")] "sqlite", + #[cfg(feature = "consul-discovery")] + "consul-discovery", #[cfg(feature = "kubernetes-discovery")] "kubernetes-discovery", #[cfg(feature = "metrics")] |