diff --git a/common/constants.nix b/common/constants.nix index ba16d1b..9055f07 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -14,9 +14,9 @@ The home directory for the default user. ''; }; - tsMask = mkOption { + wildcard = mkOption { type = types.str; - default = "100.64.0.0/10"; + default = "0.0.0.0"; description = '' The localhost address. ''; diff --git a/linux/nebula/conduit.nix b/linux/nebula/conduit.nix index 4b83409..029efc7 100644 --- a/linux/nebula/conduit.nix +++ b/linux/nebula/conduit.nix @@ -3,10 +3,10 @@ { services.matrix-conduit = { enable = true; - settings.global = let const = config.constants; in { - address = const.tsMask; - port = const.port.conduit; - server_name = config.constants.domain; + settings.global = with config.constants; { + address = wildcard; + port = port.conduit; + server_name = domain; }; }; } diff --git a/linux/nebula/forgejo.nix b/linux/nebula/forgejo.nix index a7ac4d2..c3bc7f4 100644 --- a/linux/nebula/forgejo.nix +++ b/linux/nebula/forgejo.nix @@ -6,11 +6,11 @@ appName = "Forgejo"; package = pkgs.forgejo; settings = { - server = let const = config.constants; in { - DOMAIN = const.domain; - HTTP_ADDR = const.tsMask; - HTTP_PORT = const.port.forgejo; - ROOT_URL = "https://forgejo.${const.domain}"; + server = with config.constants; { + DOMAIN = domain; + HTTP_ADDR = wildcard; + HTTP_PORT = port.forgejo; + ROOT_URL = "https://forgejo.${domain}"; }; service.DISABLE_REGISTRATION = true; session.COOKIE_SECURE = true; diff --git a/linux/singularity/headscale.nix b/linux/singularity/headscale.nix index e45c8a5..c13f64c 100644 --- a/linux/singularity/headscale.nix +++ b/linux/singularity/headscale.nix @@ -2,11 +2,11 @@ { services = { - headscale = let const = config.constants; in { + headscale = with config.constants; { enable = true; - address = const.localhost; - port = const.port.headscale; - settings.server_url = "https://headscale.${const.domain}"; + address = localhost; + port = port.headscale; + settings.server_url = "https://headscale.${domain}"; }; tailscale = { enable = true;