diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:12:38 +0200 |
| commit | 9cba0ffefa95079168f3419cf11eb98400a468db (patch) | |
| tree | f483f11d62ced67b06e017a65417135b9ba8a2ce /krebs/3modules/default.nix | |
| parent | 4de1c87ff62dadc4cbe812a48d10241d79aca183 (diff) | |
| parent | c44e649455f3c162b66fb9d2d678a7a0eeff598b (diff) | |
merge cd/master
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index be530d46f..c114b74df 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -13,6 +13,7 @@ let ./buildbot/slave.nix ./build.nix ./current.nix + ./exim.nix ./exim-retiolum.nix ./exim-smarthost.nix ./fetchWallpaper.nix @@ -157,7 +158,11 @@ let makefu tv ]; + ciko.mail = "wieczorek.stefan@gmail.com"; + Mic92.mail = "joerg@higgsboson.tk"; in { + "*@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; + "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; "makefu@krebsco.de" = makefu; @@ -218,7 +223,7 @@ let (filter (hasSuffix ".${cfg.search-domain}") longs); add-port = a: - if net.ssh.port != null + if net.ssh.port != 22 then "[${a}]:${toString net.ssh.port}" else a; in @@ -228,8 +233,25 @@ let publicKey = host.ssh.pubkey; }) (filterAttrs (_: host: host.ssh.pubkey != null) cfg.hosts); + + programs.ssh.extraConfig = concatMapStrings + (net: '' + Host ${toString (net.aliases ++ net.addrs)} + Port ${toString net.ssh.port} + '') + (filter + (net: net.ssh.port != 22) + (concatMap (host: attrValues host.nets) + (mapAttrsToList + (_: host: recursiveUpdate host + (optionalAttrs (hasAttr config.krebs.search-domain host.nets) { + nets."" = host.nets.${config.krebs.search-domain} // { + aliases = [host.name]; + addrs = []; + }; + })) + config.krebs.hosts))); } ]; -in -out +in out |