From 916487575ad9da6cdefa41e3ee4e8989ef2080a0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Nov 2016 22:28:00 +0100
Subject: krebs/3/${username}: drop lib

---
 krebs/3modules/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index ec85464df..e6ad449fa 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -90,11 +90,11 @@ let
   };
 
   imp = lib.mkMerge [
-    { krebs = import ./lass   { inherit config lib; }; }
-    { krebs = import ./makefu { inherit config lib; }; }
-    { krebs = import ./mv     { inherit config lib; }; }
-    { krebs = import ./shared { inherit config lib; }; }
-    { krebs = import ./tv     { inherit config lib; }; }
+    { krebs = import ./lass   { inherit config; }; }
+    { krebs = import ./makefu { inherit config; }; }
+    { krebs = import ./mv     { inherit config; }; }
+    { krebs = import ./shared { inherit config; }; }
+    { krebs = import ./tv     { inherit config; }; }
     {
       krebs.dns.providers = {
         "krebsco.de" = "zones";
-- 
cgit v1.2.3


From ae73660522fb8a02a86eaa7124285a3aaa3cbb14 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 11 Nov 2016 01:50:59 +0100
Subject: krebs: no extraHosts w/o aliases #2

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

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

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e6ad449fa..82ede952d 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -130,7 +130,9 @@ let
               shorts = let s = ".${cfg.search-domain}"; in
                 map (removeSuffix s) (filter (hasSuffix s) longs);
             in
-              map (addr: "${addr} ${toString aliases}") net.addrs
+              optionals
+                (aliases != [])
+                (map (addr: "${addr} ${toString aliases}") net.addrs)
           ) (filterAttrs (name: host: host.aliases != []) host.nets)
         ) cfg.hosts
       ));
-- 
cgit v1.2.3