From 926716e7e55e7bb8a87b6d4ca4bf30b57fb0a8a4 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Mon, 22 Sep 2025 00:27:23 +0200
Subject: [PATCH] caddy: Expose metrics

---
 modules/system/services/caddy.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix
index f42a4e3..814dd30 100644
--- a/modules/system/services/caddy.nix
+++ b/modules/system/services/caddy.nix
@@ -39,7 +39,7 @@ let
       '';
     };
 
-  ports = [
+  webPorts = [
     80
     443
   ];
@@ -79,14 +79,15 @@ in
   config = lib.mkIf (virtualHosts != { }) (
     lib.mkMerge [
       {
-        meta.ports.tcp.list = lib.mkIf nonTailscaleHostsExist ports;
+        meta.ports.tcp.list = lib.mkIf nonTailscaleHostsExist webPorts;
 
-        networking.firewall.allowedTCPPorts = lib.mkIf nonTailscaleHostsExist ports;
+        networking.firewall.allowedTCPPorts = [ 2019 ] ++ lib.optionals nonTailscaleHostsExist webPorts;
 
         services.caddy = {
           enable = true;
-          enableReload = false;
-          globalConfig = "admin off";
+          globalConfig = ''
+            metrics { per_host }
+          '';
           virtualHosts =
             virtualHosts
             |> lib.mapAttrs' (