Deuxfleurs/nixcfg
18
6
Fork 2
Code Issues 10 Pull requests 2 Projects Releases Wiki Activity

make the list of IPs sorted and without duplicates for robustness

Browse source
This commit is contained in:
Armaël Guéneau 2024-11-20 13:04:41 +01:00
parent c66bff55f4
commit e0385b0456
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cluster/prod/app/email/deploy/email.hcl
View file

@ -383,15 +383,24 @@ job "email" {
} }
template { template {
# Collect machine IPs from the cluster.
# We use intermediate maps to ensure we get a sorted list with no duplicates,
# so that it is robust wrt. changes in the order of the output of ls or
# addition of new machines in an existing site.
# (scratch.MapValues returns the list of *values* in the map, sorted by *key*)
data = <<EOH data = <<EOH
{{- range ls "diplonat/autodiscovery/ipv4" }} {{- range ls "diplonat/autodiscovery/ipv4" }}
{{- with $a := .Value | parseJSON }} {{ $a.address }} {{- with $a := .Value | parseJSON }}
{{- scratch.MapSet "ipv4" $a.address $a.address }}
{{- end }} {{- end }}
{{- end }} {{- end -}}
{{- range ls "diplonat/autodiscovery/ipv6" }} {{- range ls "diplonat/autodiscovery/ipv6" }}
{{- with $a := .Value | parseJSON }} [{{ $a.address }}] {{- with $a := .Value | parseJSON }}
{{- scratch.MapSet "ipv6" $a.address $a.address }}
{{- end }} {{- end }}
{{- end }} {{- end -}}
{{- range scratch.MapValues "ipv4" }}{{ . }} {{ end }}
{{- range scratch.MapValues "ipv6" }}[{{ . }}] {{ end }}
EOH EOH
destination = "secrets/postfix/rate-limit-exceptions" destination = "secrets/postfix/rate-limit-exceptions"
} }