From 168744a76cb3bb5f1fccb273cce8b7ff0231d451 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 10 Nov 2016 13:21:04 +0100 Subject: don't try to be that clever --- ymir.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/ymir.nix b/ymir.nix index aae32058..68ae8ff5 100644 --- a/ymir.nix +++ b/ymir.nix @@ -461,14 +461,7 @@ in rec { maximal_queue_lifetime = 100m bounce_queue_lifetime = 20m - sender_canonical_maps = pipemap:{unionmap:{regexp:${pkgs.writeText "nosrs" '' - /((@.*\.)|@)yggdrasil\.li$/ ACCEPT - /((@.*\.)|@)praseodym\.org$/ ACCEPT - /((@.*\.)|@)141\.li$/ ACCEPT - /((@.*\.)|@)xmpp\.li$/ ACCEPT - /((@.*\.)|@)dirty-haskell\.org$/ ACCEPT - /((@.*\.)|@)lmu\.li$/ ACCEPT - ''}, regexp:${pkgs.writeText "id" ''/^(.*)$/ $1''}}, regexp:${pkgs.writeText "clean" ''/^[^,]*,(.*)$/ $1''}, tcp:localhost:10001} + sender_canonical_maps = tcp:localhost:10001 sender_canonical_classes = envelope_sender recipient_canonical_maps = tcp:localhost:10002 recipient_canonical_classes= envelope_recipient,header_recipient @@ -485,14 +478,14 @@ in rec { services.postsrsd = { enable = false; domain = "srs.141.li"; - separator = "+"; - # excludeDomains = [ ".yggdrasil.li" "yggdrasil.li" - # ".praseodym.org" "praseodym.org" - # ".141.li" "141.li" - # ".xmpp.li" "xmpp.li" - # ".lmu.li" "lmu.li" - # ".dirty-haskell.org" "dirty-haskell.org" - # ]; + separator = "+"; + excludeDomains = [ ".yggdrasil.li" "yggdrasil.li" + ".praseodym.org" "praseodym.org" + ".141.li" "141.li" + ".xmpp.li" "xmpp.li" + ".lmu.li" "lmu.li" + ".dirty-haskell.org" "dirty-haskell.org" + ]; }; systemd.timers."mlmmj-maintd" = { -- cgit v1.2.3