makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'prism/newest'

Browse source
This commit is contained in:
lassulus 2016-08-09 21:27:26 +02:00
parent 6e65bdf41e c31c4e48b0
commit d20d606d4e
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
krebs/3modules/default.nix
View file

@ -153,6 +153,7 @@ let
to = concatMapStringsSep "," (getAttr "mail") (toList to); to = concatMapStringsSep "," (getAttr "mail") (toList to);
}; };
in mapAttrsToList format (with config.krebs.users; let in mapAttrsToList format (with config.krebs.users; let
eloop-ml = spam-ml ++ [ ciko Mic92 ];
spam-ml = [ spam-ml = [
lass lass
makefu makefu
@ -161,8 +162,10 @@ let
ciko.mail = "wieczorek.stefan@gmail.com"; ciko.mail = "wieczorek.stefan@gmail.com";
Mic92.mail = "joerg@higgsboson.tk"; Mic92.mail = "joerg@higgsboson.tk";
in { in {
"*@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; "cfp@eloop.org" = eloop-ml;
"eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "kontakt@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml;
"eloop2016@krebsco.de" = eloop-ml;
"postmaster@krebsco.de" = spam-ml; # RFC 822 "postmaster@krebsco.de" = spam-ml; # RFC 822
"lass@krebsco.de" = lass; "lass@krebsco.de" = lass;
"makefu@krebsco.de" = makefu; "makefu@krebsco.de" = makefu;

1
tv/2configs/exim-smarthost.nix
View file

@ -19,6 +19,7 @@ with config.krebs.lib;
config.krebs.hosts.xu config.krebs.hosts.xu
]; ];
internet-aliases = with config.krebs.users; [ internet-aliases = with config.krebs.users; [
{ from = "bku-eppler@viljetic.de"; to = tv.mail; }
{ from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822 { from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822
{ from = "mirko@viljetic.de"; to = mv-cd.mail; } { from = "mirko@viljetic.de"; to = mv-cd.mail; }
{ from = "tomislav@viljetic.de"; to = tv.mail; } { from = "tomislav@viljetic.de"; to = tv.mail; }