summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-09 21:27:26 +0200
committerlassulus <lass@aidsballs.de>2016-08-09 21:27:26 +0200
commitd20d606d4ebae2060c053b697aa78d2406095955 (patch)
tree90c4ede28246f859ed418dbab2fb7617b83c5160
parent6e65bdf41ec81f555330f21466f174a753430110 (diff)
parentc31c4e48b0f007709d089379edf18e41c38af68e (diff)
Merge remote-tracking branch 'prism/newest'
-rw-r--r--krebs/3modules/default.nix7
-rw-r--r--tv/2configs/exim-smarthost.nix1
2 files changed, 6 insertions, 2 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 9af42acc9..17eae1778 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -153,6 +153,7 @@ let
to = concatMapStringsSep "," (getAttr "mail") (toList to);
};
in mapAttrsToList format (with config.krebs.users; let
+ eloop-ml = spam-ml ++ [ ciko Mic92 ];
spam-ml = [
lass
makefu
@@ -161,8 +162,10 @@ let
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 ];
+ "cfp@eloop.org" = eloop-ml;
+ "kontakt@eloop.org" = eloop-ml;
+ "root@eloop.org" = eloop-ml;
+ "eloop2016@krebsco.de" = eloop-ml;
"postmaster@krebsco.de" = spam-ml; # RFC 822
"lass@krebsco.de" = lass;
"makefu@krebsco.de" = makefu;
diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index cade6fa7b..591edafb6 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -19,6 +19,7 @@ with config.krebs.lib;
config.krebs.hosts.xu
];
internet-aliases = with config.krebs.users; [
+ { from = "bku-eppler@viljetic.de"; to = tv.mail; }
{ from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822
{ from = "mirko@viljetic.de"; to = mv-cd.mail; }
{ from = "tomislav@viljetic.de"; to = tv.mail; }