diff --git a/hosts/arr/default.nix b/hosts/arr/default.nix index 50a7671..7f62044 100644 --- a/hosts/arr/default.nix +++ b/hosts/arr/default.nix @@ -5,7 +5,7 @@ ... }: let - tailscaleMagicDNS = "neon-dory.ts.net"; + p = import ../parameters.nix; in { @@ -32,7 +32,7 @@ in }; tailscale = { enable = true; - magicDNSDomain = tailscaleMagicDNS; + magicDNSDomain = p.domains.tsDns; authKeyFile = config.age.secrets.tailscale-authKey.path; }; }; diff --git a/hosts/authentik/default.nix b/hosts/authentik/default.nix index 4d7e74a..2093ade 100644 --- a/hosts/authentik/default.nix +++ b/hosts/authentik/default.nix @@ -6,7 +6,6 @@ ... }: let - tailscaleMagicDNS = "neon-dory.ts.net"; p = import ../parameters.nix; in { @@ -25,7 +24,7 @@ in networking = { tailscale = { enable = true; - magicDNSDomain = tailscaleMagicDNS; + magicDNSDomain = p.domains.tsDns; authKeyFile = config.age.secrets.tailscale-authKey.path; }; }; diff --git a/hosts/caddy/default.nix b/hosts/caddy/default.nix index 7db886a..80b441a 100644 --- a/hosts/caddy/default.nix +++ b/hosts/caddy/default.nix @@ -6,7 +6,6 @@ ... }: let - tailscaleMagicDNS = "neon-dory.ts.net"; email = "pasettodavide@gmail.com"; p = import ../parameters.nix; in @@ -134,7 +133,7 @@ in networking = { tailscale = { enable = true; - magicDNSDomain = tailscaleMagicDNS; + magicDNSDomain = p.domains.tsDns; authKeyFile = config.age.secrets.tailscale-authKey.path; }; diff --git a/hosts/deadbeef/default.nix b/hosts/deadbeef/default.nix index c5df8ac..c3edc96 100644 --- a/hosts/deadbeef/default.nix +++ b/hosts/deadbeef/default.nix @@ -6,7 +6,7 @@ ... }: let - tailscaleMagicDNS = "neon-dory.ts.net"; + p = import ../parameters.nix; homeParameters = { username = "pazpi"; @@ -63,7 +63,7 @@ in networking = { tailscale = { enable = true; - magicDNSDomain = tailscaleMagicDNS; + magicDNSDomain = p.domains.tsDns; authKeyFile = config.age.secrets.tailscale-authKey.path; }; }; diff --git a/hosts/metrics/default.nix b/hosts/metrics/default.nix index 0120bab..f4e3fc3 100644 --- a/hosts/metrics/default.nix +++ b/hosts/metrics/default.nix @@ -5,7 +5,6 @@ ... }: let - tailscaleMagicDNS = "neon-dory.ts.net"; defaultNodePort = toString config.services.prometheus.exporters.node.port; p = import ../parameters.nix; in @@ -51,7 +50,7 @@ in networking = { tailscale = { enable = true; - magicDNSDomain = tailscaleMagicDNS; + magicDNSDomain = p.domains.tsDns; authKeyFile = config.age.secrets.tailscale-authKey.path; }; diff --git a/modules/monitoring/grafana.nix b/modules/monitoring/grafana.nix index 1079b23..f81349a 100644 --- a/modules/monitoring/grafana.nix +++ b/modules/monitoring/grafana.nix @@ -110,7 +110,6 @@ in admin_password = "$__file{${cfg.adminPasswordFile}}"; }; server = { - # domain = "grafana.neon-dory.ts.net"; domain = cfg.proxy.domain; http_addr = "0.0.0.0"; http_port = 3000;