Merge remote-tracking branch 'prism/newest'
This commit is contained in:
commit
d20d606d4e
|
@ -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;
|
||||
|
|
|
@ -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; }
|
||||
|
|
Loading…
Reference in a new issue