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

Zerotier: add to inventory test machine

Browse Source
This commit is contained in:
Johannes Kirschbauer
2024-11-12 18:33:20 +01:00
parent 369204f2d1
commit aa4c653148
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
clanModules/zerotier/roles/controller.nix
View File

@@ -9,7 +9,8 @@ let
instanceName = builtins.head instanceNames; instanceName = builtins.head instanceNames;
zeroTierInstance = config.clan.inventory.services.zerotier.${instanceName}; zeroTierInstance = config.clan.inventory.services.zerotier.${instanceName};
roles = zeroTierInstance.roles; roles = zeroTierInstance.roles;
stringSet = list: builtins.attrNames (builtins.groupBy lib.id list); # TODO(@mic92): This should be upstreamed to nixpkgs
uniqueStrings = list: builtins.attrNames (builtins.groupBy lib.id list);
in in
{ {
imports = [ imports = [
@@ -18,7 +19,7 @@ in
config = { config = {
systemd.services.zerotier-inventory-autoaccept = systemd.services.zerotier-inventory-autoaccept =
let let
machines = stringSet (roles.moon.machines ++ roles.controller.machines ++ roles.peer.machines); machines = uniqueStrings (roles.moon.machines ++ roles.controller.machines ++ roles.peer.machines);
networkIps = builtins.foldl' ( networkIps = builtins.foldl' (
ips: name: ips: name:
if builtins.pathExists "${config.clan.core.clanDir}/machines/${name}/facts/zerotier-ip" then if builtins.pathExists "${config.clan.core.clanDir}/machines/${name}/facts/zerotier-ip" then

9
inventory.json
View File

@@ -16,6 +16,15 @@
} }
}, },
"services": { "services": {
"zerotier": {
"1": {
"roles": {
"controller": {
"machines": ["test-inventory-machine"]
}
}
}
},
"borgbackup": { "borgbackup": {
"simple": { "simple": {
"roles": { "roles": {