aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Jonglez <git@bitsofnetworks.org>2023-12-19 09:27:40 +0100
committerBaptiste Jonglez <git@bitsofnetworks.org>2023-12-19 09:27:40 +0100
commit55c9b89cb21b1f2adeea0e4173e10507b6defcc6 (patch)
tree8f8b191b414239d023dd11ede276a81532c0775d
parente5f3b6ef0abe3ac67b652b4ece74c933e2c1b554 (diff)
downloadnixcfg-55c9b89cb21b1f2adeea0e4173e10507b6defcc6.tar.gz
nixcfg-55c9b89cb21b1f2adeea0e4173e10507b6defcc6.zip
Revert "Revert "garage prod: use dynamically determined ipv6 addresses""
Quentin's fix seems to work fine. This reverts commit e5f3b6ef0abe3ac67b652b4ece74c933e2c1b554.
-rw-r--r--cluster/prod/app/garage/config/garage.toml13
1 files changed, 11 insertions, 2 deletions
diff --git a/cluster/prod/app/garage/config/garage.toml b/cluster/prod/app/garage/config/garage.toml
index 36daa5d..0a25255 100644
--- a/cluster/prod/app/garage/config/garage.toml
+++ b/cluster/prod/app/garage/config/garage.toml
@@ -6,8 +6,17 @@ db_engine = "lmdb"
replication_mode = "3"
-rpc_bind_addr = "[{{ env "meta.public_ipv6" }}]:3901"
-rpc_public_addr = "[{{ env "meta.public_ipv6" }}]:3901"
+# IPv6 config using the ipv6 address statically defined in Nomad's node metadata
+# make sure to put back double { and } if re-enabling this
+#rpc_bind_addr = "[{ env "meta.public_ipv6" }]:3901"
+#rpc_public_addr = "[{ env "meta.public_ipv6" }]:3901"
+
+# IPv6 config using the ipv6 address dynamically detected from diplonat
+{{ with $a := env "attr.unique.hostname" | printf "diplonat/autodiscovery/ipv6/%s" | key | parseJSON }}
+rpc_bind_addr = "[{{ $a.address }}]:3901"
+rpc_public_addr = "[{{ $a.address }}]:3901"
+{{ end }}
+
rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}"
[consul_discovery]