From 15b73a00a9f787498d3445e7eff77db4beec6d95 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 25 Oct 2016 11:32:49 +0200 Subject: always rewrite outgoing --- ymir.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ymir.nix b/ymir.nix index cfa576f0..3df5ab2d 100644 --- a/ymir.nix +++ b/ymir.nix @@ -443,6 +443,9 @@ in rec { non_smtpd_milters = local:private/dkim alias_maps = hash:/etc/postfix/aliases texthash:/srv/mail/spm + + sender_canonical_maps = tcp:127.0.0.1:10001 + sender_canonical_classes = envelope_sender ''; extraMasterConf = '' uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) @@ -450,8 +453,6 @@ in rec { mlmmj-subs unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension} policy-spf unix - n n - - spawn user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf} srs unix n - n - - smtpd - -o sender_canonical_maps = tcp:127.0.0.1:10001 - -o sender_canonical_classes = envelope_sender -o recipient_canonical_maps = tcp:127.0.0.1:10002 -o recipient_canonical_classes = envelope_recipient,header_recipient ''; -- cgit v1.2.3