From 7ed82e6c94faa947e964ea465ca7748d27192264 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 10 Nov 2016 13:15:26 +0100 Subject: reinstate SRS --- ymir.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/ymir.nix b/ymir.nix index 73ace7d2..aae32058 100644 --- a/ymir.nix +++ b/ymir.nix @@ -460,6 +460,18 @@ in rec { maximal_backoff_time = 10m 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_classes = envelope_sender + recipient_canonical_maps = tcp:localhost:10002 + recipient_canonical_classes= envelope_recipient,header_recipient ''; extraMasterConf = '' uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) @@ -470,10 +482,10 @@ in rec { networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"]; }; - # services.postsrsd = { - # enable = false; - # domain = "141.li"; - # separator = "+"; + services.postsrsd = { + enable = false; + domain = "srs.141.li"; + separator = "+"; # excludeDomains = [ ".yggdrasil.li" "yggdrasil.li" # ".praseodym.org" "praseodym.org" # ".141.li" "141.li" @@ -481,7 +493,7 @@ in rec { # ".lmu.li" "lmu.li" # ".dirty-haskell.org" "dirty-haskell.org" # ]; - # }; + }; systemd.timers."mlmmj-maintd" = { description = "run mlmmj maintenance daemon"; -- cgit v1.2.3