diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-05 17:54:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-05 17:54:44 +0200 |
| commit | c8c31c4bc16d222fe91692273d6b02820b4dd9d5 (patch) | |
| tree | 73860db61cb8d949cccf197e424c6bec4fd2c694 /krebs/3modules | |
| parent | e7779d8016cc06c5b7383e25a2e0608666495ca2 (diff) | |
| parent | 059037f5ec15754563ab1627d3056f128c986f38 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 27 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9ec9d0a8a..430194405 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,6 +105,33 @@ let combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts ); in lib.mapAttrs' (name: value: nameValuePair (("zones/" + name)) ({ text=value; })) all-zones; + krebs.exim-smarthost.internet-aliases = let + format = from: to: + # TODO assert is-retiolum-mail-address to; + { inherit from; + to = if typeOf to == "list" + then concatMapStringsSep "," (getAttr "mail") to + else to.mail; }; + in mapAttrsToList format (with config.krebs.users; let + spam-ml = [ + lass + makefu + tv + ]; + in { + "postmaster@krebsco.de" = spam-ml; # RFC 822 + "lass@krebsco.de" = lass; + "makefu@krebsco.de" = makefu; + "spam@krebsco.de" = spam-ml; + "tv@krebsco.de" = tv; + # XXX These are no internet aliases + # XXX exim-retiolum hosts should be able to relay to retiolum addresses + "lass@retiolum" = lass; + "makefu@retiolum" = makefu; + "spam@retiolum" = spam-ml; + "tv@retiolum" = tv; + }); + services.openssh.hostKeys = let inherit (config.krebs.build.host.ssh) privkey; in mkIf (privkey != null) (mkForce [privkey]); diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 96ab48e6b..49204c74f 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -146,7 +146,7 @@ with import ../../4lib { inherit lib; }; dc = "tv"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["104.233.84.70"]; + addrs4 = ["167.88.34.182"]; aliases = [ "rmdir.internet" ]; |