From 92aa60ff2e88cf7f9bde31e068dec7d41d6327c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Nov 2023 17:43:24 +0100 Subject: [PATCH] zerotier: also enable meshnamed for non-controllers --- nixosModules/clanCore/zerotier/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixosModules/clanCore/zerotier/default.nix b/nixosModules/clanCore/zerotier/default.nix index 3113ffd36..3ba1b119b 100644 --- a/nixosModules/clanCore/zerotier/default.nix +++ b/nixosModules/clanCore/zerotier/default.nix @@ -94,6 +94,8 @@ in (lib.mkIf (cfg.networkId != null) { environment.etc."zerotier/hostname".text = "${facts.zerotier-meshname.value}.vpn"; + clan.networking.meshnamed.networks.vpn.subnet = cfg.subnet; + systemd.network.enable = true; networking.useNetworkd = true; systemd.network.networks.zerotier = { @@ -153,7 +155,6 @@ in (lib.mkIf (cfg.controller.enable && config.clanCore.secrets ? zerotier && facts.zerotier-network-id.value != null) { clan.networking.zerotier.networkId = facts.zerotier-network-id.value; environment.etc."zerotier/network-id".text = facts.zerotier-network-id.value; - clan.networking.meshnamed.networks.vpn.subnet = cfg.subnet; systemd.services.zerotierone.serviceConfig.ExecStartPre = [ "+${pkgs.writeShellScript "init-zerotier" ''