clan/clan-core
11
2
Fork 13
Code Issues 91 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

zerotier: also enable meshnamed for non-controllers
All checks were successful
checks-impure / test (pull_request) Successful in 1m35s
Details
checks / test (pull_request) Successful in 1m46s
Details

Browse Source
This commit is contained in:
Jörg Thalheim 2023-11-14 17:43:24 +01:00
parent b2422f9c74
commit fdfe02fb77
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixosModules/clanCore/zerotier/default.nix
View File

@ -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" ''