diff --git a/ci/systems.json b/ci/systems.json index 9eff5489..3398e5bc 100644 --- a/ci/systems.json +++ b/ci/systems.json @@ -26,7 +26,11 @@ "hostName": "ct", "networks": { "int": null, - "local": null, + "local": { + "address4": null, + "address6": null, + "macAddress": null + }, "tail": null } } diff --git a/nixos/dnsmasq.nix b/nixos/dnsmasq.nix index 1b4d995d..374d32fe 100644 --- a/nixos/dnsmasq.nix +++ b/nixos/dnsmasq.nix @@ -38,8 +38,9 @@ mkHostRecordPair = network: system: let address4 = system.config.network.networks.${network}.address4 or null; address6 = system.config.network.networks.${network}.address6 or null; + fqdn = system.config.network.networks.${network}.fqdn or null; in nameValuePair - system.config.network.networks.${network}.fqdn or "${network}.${system.config.access.fqdn}" + (if fqdn != null then fqdn else "${network}.${system.config.access.fqdn}") (concatStringsSep "," ( lib.optional (address4 != null) (toString address4) diff --git a/nixos/reisen-ct/network.nix b/nixos/reisen-ct/network.nix index 0dbdf063..89b9c3cc 100644 --- a/nixos/reisen-ct/network.nix +++ b/nixos/reisen-ct/network.nix @@ -7,7 +7,7 @@ ... }: let inherit (lib.modules) mkIf mkBefore mkOrder; - enableDns = !config.services.dnsmasq.enable && config.networking.hostName != "utsuho" && config.networking.hostName != "ct"; + enableDns = !config.services.dnsmasq.enable && config.networking.hostName != "utsuho"; in { imports = let inherit (meta) nixos; diff --git a/systems/ct/default.nix b/systems/ct/default.nix index ea396fa3..8760b2a2 100644 --- a/systems/ct/default.nix +++ b/systems/ct/default.nix @@ -4,4 +4,11 @@ _: { modules = [ ./nixos.nix ]; + network.networks = { + local = { + fqdn = null; + address4 = null; + address6 = null; + }; + }; }