Improve domain conflict messages by setting domains per service

This commit is contained in:
SebastianStork 2025-07-05 20:41:55 +02:00
parent 44520b3cd2
commit 56b28f055d
9 changed files with 36 additions and 15 deletions

View file

@ -17,7 +17,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
meta.ports.list = [ cfg.port ]; meta = {
domains.list = [ cfg.domain ];
ports.list = [ cfg.port ];
};
services.actual = { services.actual = {
enable = true; enable = true;

View file

@ -62,10 +62,7 @@ in
config = lib.mkIf (virtualHosts != { }) ( config = lib.mkIf (virtualHosts != { }) (
lib.mkMerge [ lib.mkMerge [
{ {
meta = { meta.ports.list = lib.mkIf nonTailscaleHostsExist ports;
ports.list = lib.mkIf nonTailscaleHostsExist ports;
domains.list = lib.mapAttrsToList (_: value: value.domain) virtualHosts;
};
networking.firewall.allowedTCPPorts = lib.mkIf nonTailscaleHostsExist ports; networking.firewall.allowedTCPPorts = lib.mkIf nonTailscaleHostsExist ports;

View file

@ -26,7 +26,10 @@ in
}; };
config = lib.mkIf cfg.enable { 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; sops.secrets."forgejo/admin-password".owner = user;

View file

@ -68,7 +68,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
meta.ports.list = [ cfg.port ]; meta = {
domains.list = [ cfg.domain ];
ports.list = [ cfg.port ];
};
sops = { sops = {
secrets."healthchecks-ping-key" = { }; secrets."healthchecks-ping-key" = { };

View file

@ -26,7 +26,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
meta.ports.list = [ cfg.port ]; meta = {
domains.list = [ cfg.domain ];
ports.list = [ cfg.port ];
};
sops = { sops = {
secrets = { secrets = {

View file

@ -21,7 +21,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
meta.ports.list = [ cfg.port ]; meta = {
domains.list = [ cfg.domain ];
ports.list = [ cfg.port ];
};
services.static-web-server = { services.static-web-server = {
enable = true; enable = true;

View file

@ -25,7 +25,10 @@ in
}; };
config = lib.mkIf cfg.enable { 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; sops.secrets."nextcloud/admin-password".owner = user;

View file

@ -16,7 +16,10 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
meta.ports.list = [ cfg.port ]; meta = {
domains.list = [ cfg.domain ];
ports.list = [ cfg.port ];
};
services.ntfy-sh = { services.ntfy-sh = {
enable = true; enable = true;

View file

@ -45,10 +45,13 @@ in
} }
]; ];
meta.ports.list = [ meta = {
domains.list = lib.mkIf cfg.isServer [ cfg.gui.domain ];
ports.list = [
cfg.syncPort cfg.syncPort
cfg.gui.port cfg.gui.port
]; ];
};
services.syncthing = { services.syncthing = {
enable = true; enable = true;