diff options
author | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
commit | c64fb07027b49a3825b6f0814ebeb17782b8266a (patch) | |
tree | e1b4681fd93a4d3257b556dd8d579464d653ef77 /krebs/3modules/hosts.nix | |
parent | 1394ae1bd4bc3dcfb77b0daee996e75f8092fc5b (diff) | |
parent | 88a9183d1d36424977b0cd8ed513109433b779b2 (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/hosts.nix')
-rw-r--r-- | krebs/3modules/hosts.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix index 7fe01a769..ae0136303 100644 --- a/krebs/3modules/hosts.nix +++ b/krebs/3modules/hosts.nix @@ -24,7 +24,11 @@ in { aliases = longs ++ shorts; longs = filter check net.aliases; shorts = let s = ".${config.krebs.dns.search-domain}"; in - map (removeSuffix s) (filter (hasSuffix s) longs); + optionals + (config.krebs.dns.search-domain != null) + (map (removeSuffix s) + (filter (hasSuffix s) + longs)); in map (addr: { ${addr} = aliases; }) net.addrs) (attrValues host.nets)) @@ -44,7 +48,9 @@ in { hostNetAliases = host: mapAttrs (_: net: filter (x: x.name != null && x.value != []) [ { name = net.ip4.addr or null; value = net.aliases; } + { name = net.ip4.addr or null; value = (map (alias: "4.${alias}") net.aliases); } { name = net.ip6.addr or null; value = net.aliases; } + { name = net.ip6.addr or null; value = (map (alias: "6.${alias}") net.aliases); } ]) host.nets; # netAliases : { ${netname} : [addrAliases] } |