summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-21 21:51:11 +0100
committertv <tv@krebsco.de>2016-02-21 22:08:30 +0100
commita73eaae18c3e873c09c313590a0ab8dad1fbc5d9 (patch)
treecef5c64d779bb3e183ce925553e65861cd5a3805 /krebs/3modules/default.nix
parentde5de37a12771db395f7bc1954be52f51f54b9e2 (diff)
krebs.exim*: admit *.r
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r--krebs/3modules/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 662fd6489..186469e97 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -143,12 +143,11 @@ let
{ text=(stripEmptyLines value); }) all-zones;
krebs.exim-smarthost.internet-aliases = let
- format = from: to:
+ format = from: to: {
+ inherit from;
# TODO assert is-retiolum-mail-address to;
- { inherit from;
- to = if typeOf to == "list"
- then concatMapStringsSep "," (getAttr "mail") to
- else to.mail; };
+ to = concatMapStringsSep "," (getAttr "mail") (toList to);
+ };
in mapAttrsToList format (with config.krebs.users; let
spam-ml = [
lass
@@ -167,6 +166,10 @@ let
"makefu@retiolum" = makefu;
"spam@retiolum" = spam-ml;
"tv@retiolum" = tv;
+ "lass@r" = lass;
+ "makefu@r" = makefu;
+ "spam@r" = spam-ml;
+ "tv@r" = tv;
});
services.openssh.hostKeys =