diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-15 11:57:24 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-15 11:57:24 +0200 |
| commit | 72606368bf4771c36995a9145b120b697e38d95b (patch) | |
| tree | 300339f50aabd13a3ac5db30daaee5894e67ab3d | |
| parent | 2dad5700d3ca773d79c87bc7da02852e57270b93 (diff) | |
| download | nixcfg-72606368bf4771c36995a9145b120b697e38d95b.tar.gz nixcfg-72606368bf4771c36995a9145b120b697e38d95b.zip | |
Force Garage to use ipv6 connectivity
| -rw-r--r-- | cluster/prod/app/garage/config/garage.toml | 3 | ||||
| -rw-r--r-- | cluster/prod/app/garage/deploy/garage.hcl | 19 | ||||
| -rw-r--r-- | nix/deuxfleurs.nix | 1 |
3 files changed, 3 insertions, 20 deletions
diff --git a/cluster/prod/app/garage/config/garage.toml b/cluster/prod/app/garage/config/garage.toml index 224c755..44e7ba0 100644 --- a/cluster/prod/app/garage/config/garage.toml +++ b/cluster/prod/app/garage/config/garage.toml @@ -5,7 +5,8 @@ data_dir = "/data" replication_mode = "3" -rpc_bind_addr = "[::]:3901" +rpc_bind_addr = "[{{ env "meta.public_ipv6" }}]:3901" +rpc_public_addr = "[{{ env "meta.public_ipv6" }}]:3901" rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}" sled_cache_capacity = 536870912 diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl index ccc7dd6..51d5473 100644 --- a/cluster/prod/app/garage/deploy/garage.hcl +++ b/cluster/prod/app/garage/deploy/garage.hcl @@ -82,25 +82,6 @@ job "garage" { } service { - tags = ["garage-rpc"] - port = 3901 - address_mode = "driver" - name = "garage-rpc" - check { - type = "tcp" - port = 3901 - address_mode = "driver" - interval = "60s" - timeout = "5s" - check_restart { - limit = 3 - grace = "90s" - ignore_warnings = false - } - } - } - - service { tags = [ "garage-web", "tricot * 1", diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix index 26c11b0..b910a79 100644 --- a/nix/deuxfleurs.nix +++ b/nix/deuxfleurs.nix @@ -300,6 +300,7 @@ in network_interface = "wg0"; meta = { "site" = cfg.site_name; + "public_ipv6" = cfg.ipv6; }; }; tls = { |