summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-05-20 00:18:00 +0200
committerlassulus <lass@aidsballs.de>2016-05-20 00:18:00 +0200
commitfc867f652fdf593be81a3d3f6b9ad783e506dc61 (patch)
tree6472c25fde5adbc6b5656044fa408cac1f797bcd /krebs
parentba41135bfde877e619c85b77a2fe631b66a37184 (diff)
parentee0c30cbe5a5614e7f5f2e6edc13fb0c7c434ad4 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index e87b33600..2f3c20906 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -158,7 +158,11 @@ let
makefu
tv
];
+ ciko.mail = "wieczorek.stefan@gmail.com";
+ Mic92.mail = "joerg@higgsboson.tk";
in {
+ "cfp@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }];
+ "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ];
"postmaster@krebsco.de" = spam-ml; # RFC 822
"lass@krebsco.de" = lass;
"makefu@krebsco.de" = makefu;