Merge remote-tracking branch 'cd/master'

3 files changed, 30 insertions, 21 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"
           ];
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 811c8e4c7..f5f63d284 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -12,28 +12,10 @@
       "10.243.13.37"
     ];
     internet-aliases = with config.krebs.users; [
+      { from = "mirko@viljetic.de"; to = mv.mail; }
       { from = "tomislav@viljetic.de"; to = tv.mail; }
-
-      # (mindestens) lisp-stammtisch und elli haben die:
-      { from = "tv@viljetic.de"; to = tv.mail; }
-
       { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
-
-      { from = "mirko@viljetic.de"; to = mv.mail; }
-
-      # TODO killme (wo wird die benutzt?)
-      { from = "tv@cd.retiolum"; to = tv.mail; }
-
-      # TODO lists@smtp.retiolum [consul]
-      { from = "postmaster@krebsco.de"; to = tv.mail; }
-
-      { from = "spam@krebsco.de";
-        to = pkgs.lib.concatStringsSep "," [
-          tv.mail
-          "lass@mors.retiolum"
-          makefu.mail
-        ];
-      }
+      { from = "tv@viljetic.de"; to = tv.mail; }
     ];
     system-aliases = [
       { from = "mailer-daemon"; to = "postmaster"; }