summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-11-11 13:44:55 +0100
committermakefu <github@syntax-fehler.de>2016-11-11 13:44:55 +0100
commit4d7f0e6c5bcd8b586711ad2394fac73ebbd3312d (patch)
treea21db730913e0915ec1e319af70673e7cf4e5001 /krebs/3modules/default.nix
parent6c092cd20ca256b1cefa92aa779380cdb71c1313 (diff)
parent0e13a4e2373d891e6a895e4b6ad2b42da028ba12 (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r--krebs/3modules/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index ec85464df..82ede952d 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";
@@ -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
));