From 56b28f055de4e68ffb7aaa31a23988293c3f5ad5 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sat, 5 Jul 2025 20:41:55 +0200
Subject: [PATCH] Improve domain conflict messages by setting domains per
 service

---
 modules/system/services/actualbudget.nix      |  5 ++++-
 modules/system/services/caddy.nix             |  5 +----
 modules/system/services/forgejo/default.nix   |  5 ++++-
 modules/system/services/gatus.nix             |  5 ++++-
 modules/system/services/hedgedoc.nix          |  5 ++++-
 modules/system/services/it-tools.nix          |  5 ++++-
 modules/system/services/nextcloud/default.nix |  5 ++++-
 modules/system/services/ntfy.nix              |  5 ++++-
 modules/system/services/syncthing.nix         | 11 +++++++----
 9 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/modules/system/services/actualbudget.nix b/modules/system/services/actualbudget.nix
index 896eed3..c5ab07b 100644
--- a/modules/system/services/actualbudget.nix
+++ b/modules/system/services/actualbudget.nix
@@ -17,7 +17,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     services.actual = {
       enable = true;
diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix
index f11cf2a..f733d4a 100644
--- a/modules/system/services/caddy.nix
+++ b/modules/system/services/caddy.nix
@@ -62,10 +62,7 @@ in
   config = lib.mkIf (virtualHosts != { }) (
     lib.mkMerge [
       {
-        meta = {
-          ports.list = lib.mkIf nonTailscaleHostsExist ports;
-          domains.list = lib.mapAttrsToList (_: value: value.domain) virtualHosts;
-        };
+        meta.ports.list = lib.mkIf nonTailscaleHostsExist ports;
 
         networking.firewall.allowedTCPPorts = lib.mkIf nonTailscaleHostsExist ports;
 
diff --git a/modules/system/services/forgejo/default.nix b/modules/system/services/forgejo/default.nix
index 0fd2b0b..3c0a673 100644
--- a/modules/system/services/forgejo/default.nix
+++ b/modules/system/services/forgejo/default.nix
@@ -26,7 +26,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     sops.secrets."forgejo/admin-password".owner = user;
 
diff --git a/modules/system/services/gatus.nix b/modules/system/services/gatus.nix
index 0f929ec..dbd2790 100644
--- a/modules/system/services/gatus.nix
+++ b/modules/system/services/gatus.nix
@@ -68,7 +68,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     sops = {
       secrets."healthchecks-ping-key" = { };
diff --git a/modules/system/services/hedgedoc.nix b/modules/system/services/hedgedoc.nix
index c1cc4ff..d154c90 100644
--- a/modules/system/services/hedgedoc.nix
+++ b/modules/system/services/hedgedoc.nix
@@ -26,7 +26,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     sops = {
       secrets = {
diff --git a/modules/system/services/it-tools.nix b/modules/system/services/it-tools.nix
index 3aca856..1583003 100644
--- a/modules/system/services/it-tools.nix
+++ b/modules/system/services/it-tools.nix
@@ -21,7 +21,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     services.static-web-server = {
       enable = true;
diff --git a/modules/system/services/nextcloud/default.nix b/modules/system/services/nextcloud/default.nix
index 0300909..6a25b8c 100644
--- a/modules/system/services/nextcloud/default.nix
+++ b/modules/system/services/nextcloud/default.nix
@@ -25,7 +25,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     sops.secrets."nextcloud/admin-password".owner = user;
 
diff --git a/modules/system/services/ntfy.nix b/modules/system/services/ntfy.nix
index b86f47a..82df120 100644
--- a/modules/system/services/ntfy.nix
+++ b/modules/system/services/ntfy.nix
@@ -16,7 +16,10 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    meta.ports.list = [ cfg.port ];
+    meta = {
+      domains.list = [ cfg.domain ];
+      ports.list = [ cfg.port ];
+    };
 
     services.ntfy-sh = {
       enable = true;
diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix
index f206ede..043dee6 100644
--- a/modules/system/services/syncthing.nix
+++ b/modules/system/services/syncthing.nix
@@ -45,10 +45,13 @@ in
       }
     ];
 
-    meta.ports.list = [
-      cfg.syncPort
-      cfg.gui.port
-    ];
+    meta = {
+      domains.list = lib.mkIf cfg.isServer [ cfg.gui.domain ];
+      ports.list = [
+        cfg.syncPort
+        cfg.gui.port
+      ];
+    };
 
     services.syncthing = {
       enable = true;