diff --git a/hosts/plover/modules/hardware/networks.nix b/hosts/plover/modules/hardware/networks.nix index d3f34bec..59a8a6cf 100644 --- a/hosts/plover/modules/hardware/networks.nix +++ b/hosts/plover/modules/hardware/networks.nix @@ -65,9 +65,6 @@ rec { }; }; - # The private network for this host. - preferredInternalTLD = "internal"; - # Wireguard-related things. wireguardPort = 51820; wireguardIPHostPart = "10.210.0"; diff --git a/hosts/plover/modules/services/atuin.nix b/hosts/plover/modules/services/atuin.nix index 6e80d5a5..417f1f43 100644 --- a/hosts/plover/modules/services/atuin.nix +++ b/hosts/plover/modules/services/atuin.nix @@ -4,9 +4,9 @@ { config, lib, pkgs, ... }: let - inherit (import ../hardware/networks.nix) preferredInternalTLD interfaces; + inherit (import ../hardware/networks.nix) interfaces; - atuinInternalDomain = "atuin.${config.networking.domain}.${preferredInternalTLD}"; + atuinInternalDomain = "atuin.${config.networking.fqdn}"; host = interfaces.internal.IPv4.address; in { diff --git a/hosts/plover/modules/services/keycloak.nix b/hosts/plover/modules/services/keycloak.nix index 62c41364..7766e305 100644 --- a/hosts/plover/modules/services/keycloak.nix +++ b/hosts/plover/modules/services/keycloak.nix @@ -2,10 +2,10 @@ { config, lib, pkgs, ... }: let - inherit (import ../hardware/networks.nix) preferredInternalTLD interfaces; + inherit (import ../hardware/networks.nix) interfaces; authDomain = "auth.${config.networking.domain}"; - authInternalDomain = "auth.${config.networking.domain}.${preferredInternalTLD}"; + authInternalDomain = "auth.${config.networking.fqdn}"; # This is also set on our own. keycloakUser = config.services.keycloak.database.username; diff --git a/hosts/plover/modules/services/portunus.nix b/hosts/plover/modules/services/portunus.nix index 42977904..861f1d9d 100644 --- a/hosts/plover/modules/services/portunus.nix +++ b/hosts/plover/modules/services/portunus.nix @@ -4,7 +4,7 @@ { config, lib, pkgs, ... }: let - ldapDomain = "ldap.${config.networking.domain}"; + ldapDomain = "ldap.${config.networking.fqdn}"; in { services.portunus = { diff --git a/hosts/plover/modules/services/wireguard.nix b/hosts/plover/modules/services/wireguard.nix index f7f08cde..c35bd8d5 100644 --- a/hosts/plover/modules/services/wireguard.nix +++ b/hosts/plover/modules/services/wireguard.nix @@ -5,7 +5,7 @@ let acmeName = "wireguard.${config.networking.domain}"; inherit (builtins) toString; - inherit (import ../hardware/networks.nix) interfaces wireguardPort wireguardPeers preferredInternalTLD; + inherit (import ../hardware/networks.nix) interfaces wireguardPort wireguardPeers; wireguardIFName = "wireguard0"; @@ -13,7 +13,7 @@ let phonePeerAddresses = with wireguardPeers.phone; [ "${IPv4}/24" "${IPv6}/96" ]; internalDomains = [ - "~${config.networking.domain}.${preferredInternalTLD}" + "~${config.networking.fqdn}" ]; in {