privatevoid.net/depot
1
1
Fork 0
Code Issues 25 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

cluster/services/ways: don't render empty upstream blocks

Browse source
This commit is contained in:
Max Headroom 2024-08-10 03:00:22 +02:00
parent 50e5da9340
commit d752e712dd
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cluster/services/ways/host.nix
View file

@ -69,11 +69,16 @@ in
{ {
source = let source = let
upstreams = lib.mapAttrsToList (_: cfg: '' upstreams = lib.mapAttrsToList (_: cfg: ''
{{ if ne (len (service "${cfg.consulService}~_agent")) 0 }}
# ${cfg.consulService}
upstream ${cfg.nginxUpstreamName} { upstream ${cfg.nginxUpstreamName} {
{{ range $i, $e := service "${cfg.consulService}~_agent" -}} {{ range $i, $e := service "${cfg.consulService}~_agent" -}}
server {{ .Address }}:{{ .Port }}{{ if ne $i 0 }} backup{{ end }}; server {{ .Address }}:{{ .Port }}{{ if ne $i 0 }} backup{{ end }};
{{end}} {{ end }}
} }
{{ else }}
# upstream ${cfg.nginxUpstreamName} (${cfg.consulService}): no servers available
{{ end }}
'') consulServiceWays; '') consulServiceWays;
in pkgs.writeText "ways-upstreams.ctmpl" (lib.concatStringsSep "\n" (lib.unique upstreams)); in pkgs.writeText "ways-upstreams.ctmpl" (lib.concatStringsSep "\n" (lib.unique upstreams));
destination = "/run/consul-template/nginx-ways-upstreams.conf"; destination = "/run/consul-template/nginx-ways-upstreams.conf";