Read mesh host map from clan zerotier vars instead of hardcoding

The control/ns1/ns2 mesh IPs and the /88 subnet were duplicated literals in
mesh-hosts.nix. clan-core's zerotier generator already writes each machine's IP
as a public var (vars/per-machine/<m>/zerotier/zerotier-ip), so read from there
and derive the subnet from zerotier-network-id. Pure refactor: the rendered
values are identical and the system derivation hash is unchanged.
This commit is contained in:
Berwn
2026-06-17 11:53:56 +07:00
parent 8ac96b2d10
commit 848c4ec47d
4 changed files with 29 additions and 13 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
...
}:
let
mesh = import ../mesh-hosts.nix;
mesh = import ../mesh-hosts.nix { inherit config lib; };
knotEnabled = config.services.knot.enable;
# node_exporter on every host; knot-exporter only where Knot runs.
ports = [ 9100 ] ++ lib.optional knotEnabled 9433;
+1 -1
View File
@@ -9,7 +9,7 @@
...
}:
let
mesh = import ../mesh-hosts.nix;
mesh = import ../mesh-hosts.nix { inherit config lib; };
vmPort = 8428;
grafanaPort = 3000;
controlV6 = mesh.hosts.control;