From 145e76cec71d6f02e14981ca0fa51fabbed6740a Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 3 Nov 2025 23:34:34 +0100 Subject: [PATCH] caddy: Simplify with `HostsExist` variables --- modules/system/services/caddy.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix index 6f14217..0e72cc8 100644 --- a/modules/system/services/caddy.nix +++ b/modules/system/services/caddy.nix @@ -11,8 +11,8 @@ let virtualHosts = cfg.virtualHosts |> lib.attrValues |> lib.filter (value: value.enable); - tailscaleHosts = virtualHosts |> lib.filter (value: lib'.isTailscaleDomain value.domain); - nonTailscaleHosts = virtualHosts |> lib.filter (value: !lib'.isTailscaleDomain value.domain); + publicHostsExist = virtualHosts |> lib.any (value: !lib'.isTailscaleDomain value.domain); + tailscaleHostsExist = virtualHosts |> lib.any (value: lib'.isTailscaleDomain value.domain); webPorts = [ 80 @@ -86,12 +86,12 @@ in custom.persist.directories = [ "/var/lib/caddy" ]; } - (lib.mkIf (nonTailscaleHosts != [ ]) { + (lib.mkIf publicHostsExist { meta.ports.tcp.list = webPorts; networking.firewall.allowedTCPPorts = webPorts; }) - (lib.mkIf (tailscaleHosts != [ ]) { + (lib.mkIf tailscaleHostsExist { sops.secrets."tailscale/service-auth-key" = { owner = user; restartUnits = [ "caddy.service" ];