aboutsummaryrefslogtreecommitdiff
path: root/cluster/prod/app
diff options
context:
space:
mode:
authorBaptiste Jonglez <git@bitsofnetworks.org>2023-12-19 08:31:34 +0100
committerBaptiste Jonglez <git@bitsofnetworks.org>2023-12-19 08:38:12 +0100
commite5f3b6ef0abe3ac67b652b4ece74c933e2c1b554 (patch)
treedfa55eb683157fec427429b3942660adaa9583bd /cluster/prod/app
parent516ab9ad91198008a7063a3d2e664e6f23fe47a2 (diff)
downloadnixcfg-e5f3b6ef0abe3ac67b652b4ece74c933e2c1b554.tar.gz
nixcfg-e5f3b6ef0abe3ac67b652b4ece74c933e2c1b554.zip
Revert "garage prod: use dynamically determined ipv6 addresses"
This partially reverts commit 47e982b29d41e8b271100b9961b6766e96e009b1. This leads to invalid config: Dec 19 08:23:09 courgette 25f10ae4271c[781]: 2023-12-19T07:23:09.087813Z INFO garage::server: Loading configuration... Dec 19 08:23:09 courgette 25f10ae4271c[781]: Error: TOML decode error: TOML parse error at line 16, column 17 Dec 19 08:23:09 courgette 25f10ae4271c[781]: | Dec 19 08:23:09 courgette 25f10ae4271c[781]: 16 | rpc_bind_addr = "[<no value>]:3901" Dec 19 08:23:09 courgette 25f10ae4271c[781]: | ^^^^^^^^^^^^^^^^^^^ Dec 19 08:23:09 courgette 25f10ae4271c[781]: invalid socket address syntax Dec 19 08:23:09 courgette 25f10ae4271c[781]:
Diffstat (limited to 'cluster/prod/app')
-rw-r--r--cluster/prod/app/garage/config/garage.toml13
1 files changed, 2 insertions, 11 deletions
diff --git a/cluster/prod/app/garage/config/garage.toml b/cluster/prod/app/garage/config/garage.toml
index 0a25255..36daa5d 100644
--- a/cluster/prod/app/garage/config/garage.toml
+++ b/cluster/prod/app/garage/config/garage.toml
@@ -6,17 +6,8 @@ db_engine = "lmdb"
replication_mode = "3"
-# 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_bind_addr = "[{{ env "meta.public_ipv6" }}]:3901"
+rpc_public_addr = "[{{ env "meta.public_ipv6" }}]:3901"
rpc_secret = "{{ key "secrets/garage/rpc_secret" | trimSpace }}"
[consul_discovery]