yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drop zerotier-subnet, we can compute this.

Browse Source
This commit is contained in:
Jörg Thalheim
2023-11-14 13:50:44 +01:00
parent bdc8ef63ed
commit 5d41bcee7f
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,13 +97,11 @@ in
facts.zerotier-ip = { }; facts.zerotier-ip = { };
facts.zerotier-meshname = { }; facts.zerotier-meshname = { };
facts.zerotier-network-id = { }; facts.zerotier-network-id = { };
facts.zerotier-subnet = { };
secrets.zerotier-identity-secret = { }; secrets.zerotier-identity-secret = { };
generator = '' generator = ''
export PATH=${lib.makeBinPath [ config.services.zerotierone.package pkgs.fakeroot ]} export PATH=${lib.makeBinPath [ config.services.zerotierone.package pkgs.fakeroot ]}
${pkgs.python3.interpreter} ${./generate.py} --mode network \ ${pkgs.python3.interpreter} ${./generate.py} --mode network \
--ip "$facts/zerotier-ip" \ --ip "$facts/zerotier-ip" \
--subnet "$facts/zerotier-subnet" \
--meshname "$facts/zerotier-meshname" \ --meshname "$facts/zerotier-meshname" \
--identity-secret "$secrets/zerotier-identity-secret" \ --identity-secret "$secrets/zerotier-identity-secret" \
--network-id "$facts/zerotier-network-id" --network-id "$facts/zerotier-network-id"

3
nixosModules/clanCore/zerotier/generate.py
View File

@@ -195,7 +195,6 @@ def main() -> None:
"--mode", choices=["network", "identity"], required=True, type=str "--mode", choices=["network", "identity"], required=True, type=str
) )
parser.add_argument("--ip", type=Path, required=True) 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("--meshname", type=Path, required=True)
parser.add_argument("--identity-secret", type=Path, required=True) parser.add_argument("--identity-secret", type=Path, required=True)
parser.add_argument("--network-id", type=str, required=False) parser.add_argument("--network-id", type=str, required=False)
@@ -219,8 +218,6 @@ def main() -> None:
args.identity_secret.write_text(identity.private) args.identity_secret.write_text(identity.private)
args.ip.write_text(ip.compressed) 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) args.meshname.write_text(meshname)