From b0880d573677e0f32562a40d127910ec6a1d3ae2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Aug 2020 11:28:27 +0200
Subject: krebs.dns: allow disabling search-domain

---
 krebs/3modules/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'krebs/3modules/default.nix')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index f3180722d..ccc3a44b9 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -152,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}"
@@ -177,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 = [];
-- 
cgit v1.2.3