diff --git a/modules/system/meta/domains.nix b/modules/system/meta/domains.nix index d0c0914..9334842 100644 --- a/modules/system/meta/domains.nix +++ b/modules/system/meta/domains.nix @@ -10,16 +10,16 @@ let in { options.meta.domains = { - list = lib.mkOption { + local = lib.mkOption { type = lib.types.listOf lib.types.nonEmptyStr; default = [ ]; }; - globalList = lib.mkOption { + global = lib.mkOption { type = lib.types.listOf lib.types.nonEmptyStr; default = self.nixosConfigurations |> lib.attrValues - |> lib.map (value: value.config.meta.domains.list) + |> lib.map (value: value.config.meta.domains.local) |> lib.concatLists; readOnly = true; }; @@ -32,7 +32,7 @@ in duplicateDomains = self.nixosConfigurations |> lib.attrValues - |> lib.map (value: value.options.meta.domains.list.definitionsWithLocations) + |> lib.map (value: value.options.meta.domains.local.definitionsWithLocations) |> lib.concatLists |> lib.concatMap ( { file, value }: diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index 99546b1..0e2e652 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -54,7 +54,7 @@ in ]; meta = { - domains.list = lib.mkIf (cfg.gui.domain != null) [ cfg.gui.domain ]; + domains.local = lib.mkIf (cfg.gui.domain != null) [ cfg.gui.domain ]; ports = { tcp.list = [ cfg.syncPort diff --git a/modules/system/web-services/actualbudget.nix b/modules/system/web-services/actualbudget.nix index 4d87fbe..d73bfbc 100644 --- a/modules/system/web-services/actualbudget.nix +++ b/modules/system/web-services/actualbudget.nix @@ -20,7 +20,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/alloy.nix b/modules/system/web-services/alloy.nix index edbd69b..c9dd919 100644 --- a/modules/system/web-services/alloy.nix +++ b/modules/system/web-services/alloy.nix @@ -64,7 +64,7 @@ in metricsAssertions ++ logsAssertions; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix index b0edc4c..9dbec43 100644 --- a/modules/system/web-services/filebrowser.nix +++ b/modules/system/web-services/filebrowser.nix @@ -40,7 +40,7 @@ in ]; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/forgejo/default.nix b/modules/system/web-services/forgejo/default.nix index b8c6df6..1e03155 100644 --- a/modules/system/web-services/forgejo/default.nix +++ b/modules/system/web-services/forgejo/default.nix @@ -28,7 +28,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/freshrss.nix b/modules/system/web-services/freshrss.nix index f7dc010..bf55190 100644 --- a/modules/system/web-services/freshrss.nix +++ b/modules/system/web-services/freshrss.nix @@ -30,7 +30,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/gatus.nix b/modules/system/web-services/gatus.nix index 8e63742..7d5cb0d 100644 --- a/modules/system/web-services/gatus.nix +++ b/modules/system/web-services/gatus.nix @@ -74,7 +74,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; @@ -181,7 +181,7 @@ in let defaultEndpoints = self.nixosConfigurations - |> lib.mapAttrs (_: value: value.config.meta.domains.list) + |> lib.mapAttrs (_: value: value.config.meta.domains.local) |> lib.concatMapAttrs ( hostName: domains: domains diff --git a/modules/system/web-services/grafana.nix b/modules/system/web-services/grafana.nix index 6d18eef..2fea631 100644 --- a/modules/system/web-services/grafana.nix +++ b/modules/system/web-services/grafana.nix @@ -51,7 +51,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/it-tools.nix b/modules/system/web-services/it-tools.nix index c738d91..3ec376c 100644 --- a/modules/system/web-services/it-tools.nix +++ b/modules/system/web-services/it-tools.nix @@ -17,7 +17,7 @@ in }; config = lib.mkIf cfg.enable { - meta.domains.list = [ cfg.domain ]; + meta.domains.local = [ cfg.domain ]; custom.services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib"; }; diff --git a/modules/system/web-services/memos.nix b/modules/system/web-services/memos.nix index f190142..746ba09 100644 --- a/modules/system/web-services/memos.nix +++ b/modules/system/web-services/memos.nix @@ -41,7 +41,7 @@ in ]; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/ntfy.nix b/modules/system/web-services/ntfy.nix index f4f1f5f..1c452a9 100644 --- a/modules/system/web-services/ntfy.nix +++ b/modules/system/web-services/ntfy.nix @@ -17,7 +17,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/openspeedtest.nix b/modules/system/web-services/openspeedtest.nix index a5ba3d2..14c81b4 100644 --- a/modules/system/web-services/openspeedtest.nix +++ b/modules/system/web-services/openspeedtest.nix @@ -17,7 +17,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/outline.nix b/modules/system/web-services/outline.nix index e0e9c02..9970167 100644 --- a/modules/system/web-services/outline.nix +++ b/modules/system/web-services/outline.nix @@ -23,7 +23,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/personal-blog.nix b/modules/system/web-services/personal-blog.nix index 8e2fad7..0acb4c6 100644 --- a/modules/system/web-services/personal-blog.nix +++ b/modules/system/web-services/personal-blog.nix @@ -19,7 +19,7 @@ in }; config = lib.mkIf cfg.enable { - meta.domains.list = [ cfg.domain ]; + meta.domains.local = [ cfg.domain ]; systemd.services.generate-blog = { serviceConfig.Type = "oneshot"; diff --git a/modules/system/web-services/privatebin.nix b/modules/system/web-services/privatebin.nix index d7ebc50..66ba5a5 100644 --- a/modules/system/web-services/privatebin.nix +++ b/modules/system/web-services/privatebin.nix @@ -31,7 +31,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/radicale.nix b/modules/system/web-services/radicale.nix index 3cf0811..75d9b8f 100644 --- a/modules/system/web-services/radicale.nix +++ b/modules/system/web-services/radicale.nix @@ -26,7 +26,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/stirling-pdf.nix b/modules/system/web-services/stirling-pdf.nix index 6f1b653..dabba48 100644 --- a/modules/system/web-services/stirling-pdf.nix +++ b/modules/system/web-services/stirling-pdf.nix @@ -27,7 +27,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/uptime-kuma.nix b/modules/system/web-services/uptime-kuma.nix index 3d095f0..5fce7b4 100644 --- a/modules/system/web-services/uptime-kuma.nix +++ b/modules/system/web-services/uptime-kuma.nix @@ -17,7 +17,7 @@ in config = lib.mkIf cfg.enable { meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/victorialogs.nix b/modules/system/web-services/victorialogs.nix index 1319a5a..18f8611 100644 --- a/modules/system/web-services/victorialogs.nix +++ b/modules/system/web-services/victorialogs.nix @@ -27,7 +27,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; }; diff --git a/modules/system/web-services/victoriametrics.nix b/modules/system/web-services/victoriametrics.nix index 2f33361..8115ea6 100644 --- a/modules/system/web-services/victoriametrics.nix +++ b/modules/system/web-services/victoriametrics.nix @@ -27,7 +27,7 @@ in }; meta = { - domains.list = [ cfg.domain ]; + domains.local = [ cfg.domain ]; ports.tcp.list = [ cfg.port ]; };