diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-19 21:16:46 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-19 21:16:46 +0200 |
| commit | 0b4329eb0a24e5f6e5935f6242c7087015fdf104 (patch) | |
| tree | 20b4b0302b601827c49adff0add17e66e3609cf0 /krebs/3modules/default.nix | |
| parent | 6538131f91ce9dbedc8efaa6c1d6196ad5b0f3d6 (diff) | |
| parent | 358633f9737c8327d6028ebfadf72cbb51df70fb (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 2772bf98..bd6bab37 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -109,7 +109,6 @@ let { krebs.dns.providers = { "krebsco.de" = "zones"; - gg23 = "hosts"; shack = "hosts"; i = "hosts"; r = "hosts"; @@ -153,9 +152,11 @@ let let longs = net.aliases; shorts = - map (removeSuffix ".${cfg.dns.search-domain}") - (filter (hasSuffix ".${cfg.dns.search-domain}") - longs); + optionals + (cfg.dns.search-domain != null) + (map (removeSuffix ".${cfg.dns.search-domain}") + (filter (hasSuffix ".${cfg.dns.search-domain}") + longs)); add-port = a: if net.ssh.port != 22 then "[${a}]:${toString net.ssh.port}" @@ -178,7 +179,8 @@ let (concatMap (host: attrValues host.nets) (mapAttrsToList (_: host: recursiveUpdate host - (optionalAttrs (hasAttr cfg.dns.search-domain host.nets) { + (optionalAttrs (cfg.dns.search-domain != null && + hasAttr cfg.dns.search-domain host.nets) { nets."" = host.nets.${cfg.dns.search-domain} // { aliases = [host.name]; addrs = []; |