From 8167fe985a9d97ec4fd9c5b1c2d559deba100642 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:01:21 +0200 Subject: define spam-ml in krebs/3modules --- tv/2configs/exim-smarthost.nix | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 811c8e4c7..07acd593b 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -26,14 +26,6 @@ # 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 - ]; - } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From a626c2a070bbc24a37dffc3953842b02db6a703a Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:03:51 +0200 Subject: postmaster@krebsco.de -> spam-ml --- tv/2configs/exim-smarthost.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index 07acd593b..dc2ef2395 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -23,9 +23,6 @@ # 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; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 0e93d668772d1c19da76b38ee73ca07f211230be Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 5 Oct 2015 03:07:14 +0200 Subject: tv: cleanup internet-aliases --- tv/2configs/exim-smarthost.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tv/2configs') diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index dc2ef2395..f5f63d284 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -12,17 +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; } + { from = "tv@viljetic.de"; to = tv.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3