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

add option to extend path for generator

Browse Source
This commit is contained in:
Jörg Thalheim
2023-11-30 13:01:38 +01:00
parent 3ba9f441df
commit f208bc0f22
5 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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