diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
| commit | fe586d704eed42421ad3fe0d140c0caa64764a68 (patch) | |
| tree | a07d0c4d09ef780f703ae03435d51ac60019c956 /krebs/3modules/default.nix | |
| parent | 138bdc6bf6a18a59cf47d2d2db7c4e7640f50641 (diff) | |
| parent | c784d271c5dc8783e5e6308baf4f6dd26430bfca (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 65c1aa2e..b1e0ef15 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -93,11 +93,12 @@ let de.krebsco = "zones"; gg23 = "hosts"; shack = "hosts"; + i = "hosts"; internet = "hosts"; + r = "hosts"; retiolum = "hosts"; }; - # XXX This overlaps with krebs.retiolum networking.extraHosts = concatStringsSep "\n" (flatten ( mapAttrsToList (hostname: host: mapAttrsToList (netname: net: @@ -105,10 +106,8 @@ let aliases = longs ++ shorts; providers = dns.split-by-provider net.aliases cfg.dns.providers; longs = providers.hosts; - shorts = - map (removeSuffix ".${cfg.search-domain}") - (filter (hasSuffix ".${cfg.search-domain}") - longs); + shorts = let s = ".${cfg.search-domain}"; in + map (removeSuffix s) (filter (hasSuffix s) longs); in map (addr: "${addr} ${toString aliases}") net.addrs ) (filterAttrs (name: host: host.aliases != []) host.nets) |