From 5d41bcee7fa08e6b70485e720c8eb3b6e3e46294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Nov 2023 13:50:44 +0100 Subject: [PATCH] drop zerotier-subnet, we can compute this. --- nixosModules/clanCore/zerotier/default.nix | 2 -- nixosModules/clanCore/zerotier/generate.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/nixosModules/clanCore/zerotier/default.nix b/nixosModules/clanCore/zerotier/default.nix index 0b91e498..2d3c2bb9 100644 --- a/nixosModules/clanCore/zerotier/default.nix +++ b/nixosModules/clanCore/zerotier/default.nix @@ -97,13 +97,11 @@ in facts.zerotier-ip = { }; facts.zerotier-meshname = { }; facts.zerotier-network-id = { }; - facts.zerotier-subnet = { }; secrets.zerotier-identity-secret = { }; generator = '' export PATH=${lib.makeBinPath [ config.services.zerotierone.package pkgs.fakeroot ]} ${pkgs.python3.interpreter} ${./generate.py} --mode network \ --ip "$facts/zerotier-ip" \ - --subnet "$facts/zerotier-subnet" \ --meshname "$facts/zerotier-meshname" \ --identity-secret "$secrets/zerotier-identity-secret" \ --network-id "$facts/zerotier-network-id" diff --git a/nixosModules/clanCore/zerotier/generate.py b/nixosModules/clanCore/zerotier/generate.py index 128c156a..4bc2ec0d 100644 --- a/nixosModules/clanCore/zerotier/generate.py +++ b/nixosModules/clanCore/zerotier/generate.py @@ -195,7 +195,6 @@ def main() -> None: "--mode", choices=["network", "identity"], required=True, type=str ) parser.add_argument("--ip", type=Path, required=True) - parser.add_argument("--subnet", type=Path) parser.add_argument("--meshname", type=Path, required=True) parser.add_argument("--identity-secret", type=Path, required=True) parser.add_argument("--network-id", type=str, required=False) @@ -219,8 +218,6 @@ def main() -> None: args.identity_secret.write_text(identity.private) args.ip.write_text(ip.compressed) - if args.subnet is not None: - args.subnet.write_text(ipaddress.ip_network(ip).compressed) args.meshname.write_text(meshname)