Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: gracefully handle the config option not existing

Browse source
This commit is contained in:
silver 2023-01-18 00:19:45 +00:00
parent ea493b434b
commit 1378338bb2
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
machines/agentjones.nix
View file

@ -72,9 +72,13 @@ in {
lib.attrsets.mapAttrsToList (key: value: lib.attrsets.mapAttrsToList (key: value:
# make sure that anything running this firewall dosent count (recursion otherewise) # make sure that anything running this firewall dosent count (recursion otherewise)
# firewall may want to open ports in itself but can deal with that later # firewall may want to open ports in itself but can deal with that later
if value.config.skynet_firewall.enable if builtins.hasAttr "skynet_firewall" value.config
then [] then (
else value.config.skynet_firewall.forward if value.config.skynet_firewall.enable
then []
else value.config.skynet_firewall.forward
)
else []
) nodes ) nodes
); );
}; };

20
machines/vendetta.nix
View file

@ -46,17 +46,25 @@ in {
# using the same logic as the firewall, comments there # using the same logic as the firewall, comments there
external = builtins.concatLists ( external = builtins.concatLists (
lib.attrsets.mapAttrsToList (key: value: lib.attrsets.mapAttrsToList (key: value:
if value.config.deployment.hostname == hostname if builtins.hasAttr "skynet_dns" value.config
then own.external then (
else value.config.skynet_dns.records.external if value.config.deployment.targetHost == hostname
then own.external
else value.config.skynet_dns.records.external
)
else []
) nodes ) nodes
); );
cname = builtins.concatLists ( cname = builtins.concatLists (
lib.attrsets.mapAttrsToList (key: value: lib.attrsets.mapAttrsToList (key: value:
if value.config.deployment.hostname == hostname if builtins.hasAttr "skynet_dns" value.config
then own.cname then (
else value.config.skynet_dns.records.cname if value.config.deployment.targetHost == hostname
then own.cname
else value.config.skynet_dns.records.cname
)
else []
) nodes ) nodes
); );
}; };