From da9008c3795b2d0aba0227cefa643fbfbb4bd89d Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Fri, 6 Jun 2025 21:52:34 +0200
Subject: [PATCH] Extract mkVirtualHostConfig function

---
 modules/system/services/caddy.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix
index 6b6dd32..714bc5e 100644
--- a/modules/system/services/caddy.nix
+++ b/modules/system/services/caddy.nix
@@ -19,6 +19,17 @@ let
   nonTailscaleHostsExist = lib.any (v: !isTailscaleDomain v.domain) (lib.attrValues virtualHosts);
 
   getSubdomain = domain: domain |> lib.splitString "." |> lib.head;
+
+  mkVirtualHostConfig = domain: port: {
+    logFormat = "output file ${config.services.caddy.logDir}/access-${domain}.log { mode 640 }";
+    extraConfig = ''
+      ${lib.optionalString (isTailscaleDomain domain) ''
+        bind tailscale/${getSubdomain domain}
+        tailscale_auth
+      ''}
+      reverse_proxy localhost:${toString port}
+    '';
+  };
 in
 {
   options.custom.services.caddy.virtualHosts = lib.mkOption {
@@ -51,19 +62,11 @@ in
       {
         services.caddy = {
           enable = true;
-          virtualHosts = lib.mapAttrs' (
-            _: value:
-            lib.nameValuePair value.domain {
-              logFormat = "output file ${config.services.caddy.logDir}/access-${value.domain}.log { mode 640 }";
-              extraConfig = lib.concatStrings [
-                (lib.optionalString (isTailscaleDomain value.domain) ''
-                  bind tailscale/${getSubdomain value.domain}
-                  tailscale_auth
-                '')
-                "reverse_proxy localhost:${toString value.port}"
-              ];
-            }
-          ) virtualHosts;
+          virtualHosts =
+            virtualHosts
+            |> lib.mapAttrs' (
+              _: value: lib.nameValuePair value.domain (mkVirtualHostConfig value.domain value.port)
+            );
         };
 
         networking.firewall.allowedTCPPorts = lib.mkIf nonTailscaleHostsExist [