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 /tv | |
parent | e7779d8016cc06c5b7383e25a2e0608666495ca2 (diff) | |
parent | 059037f5ec15754563ab1627d3056f128c986f38 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/2configs/exim-smarthost.nix | 22 |
1 files changed, 2 insertions, 20 deletions
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"; } |