From d1dc6a0e72ec58c250a441e719db4354626c9608 Mon Sep 17 00:00:00 2001 From: kat Date: Mon, 26 Sep 2022 08:30:22 -0700 Subject: [PATCH] fix(network): maybe? --- nixos/network.nix | 2 +- nixos/systems/koishi.nix | 2 +- tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/network.nix b/nixos/network.nix index ebbde5cb..c9fad468 100644 --- a/nixos/network.nix +++ b/nixos/network.nix @@ -283,7 +283,7 @@ inherit (settings) domain; } // optionalAttrs (settings.domain == "@" || settings.domain == "" || settings.domain == null) { }) networks') address_families; - in mkMerge (networks'' ++ domains' ++ [ extraDomains ]); + in mkMerge (if tf.state.enable then (networks'' ++ domains' ++ [ extraDomains ]) else []); acme = let home = meta.deploy.targets.home.tf; diff --git a/nixos/systems/koishi.nix b/nixos/systems/koishi.nix index d5edf1be..f23f1412 100644 --- a/nixos/systems/koishi.nix +++ b/nixos/systems/koishi.nix @@ -12,7 +12,7 @@ config = { programs.ssh.extraConfig = '' Host daiyousei-build - HostName ${meta.tailnet.daiyousei.ipv4} + HostName ${meta.network.nodes.nixos.daiyousei.networks.internet.uqdn} Port 62954 User root ''; diff --git a/tf b/tf index 8677c775..b437fcdf 160000 --- a/tf +++ b/tf @@ -1 +1 @@ -Subproject commit 8677c775dad6c88703793030281502c755cfff3b +Subproject commit b437fcdf335a6ac1fd710603c4f9b9033752922e