summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-10-25 11:32:49 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-10-25 11:32:49 +0200
commit15b73a00a9f787498d3445e7eff77db4beec6d95 (patch)
tree19ef9351aa9ada9f5ba8f8db8083252bf5b9baca
parent6054fbb37e3967ab7f06b8c554a6f1d88c53c3f7 (diff)
downloadnixos-15b73a00a9f787498d3445e7eff77db4beec6d95.tar
nixos-15b73a00a9f787498d3445e7eff77db4beec6d95.tar.gz
nixos-15b73a00a9f787498d3445e7eff77db4beec6d95.tar.bz2
nixos-15b73a00a9f787498d3445e7eff77db4beec6d95.tar.xz
nixos-15b73a00a9f787498d3445e7eff77db4beec6d95.zip
always rewrite outgoing
-rw-r--r--ymir.nix5
1 files 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 {
443 non_smtpd_milters = local:private/dkim 443 non_smtpd_milters = local:private/dkim
444 444
445 alias_maps = hash:/etc/postfix/aliases texthash:/srv/mail/spm 445 alias_maps = hash:/etc/postfix/aliases texthash:/srv/mail/spm
446
447 sender_canonical_maps = tcp:127.0.0.1:10001
448 sender_canonical_classes = envelope_sender
446 ''; 449 '';
447 extraMasterConf = '' 450 extraMasterConf = ''
448 uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) 451 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 {
450 mlmmj-subs unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension} 453 mlmmj-subs unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}
451 policy-spf unix - n n - - spawn user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf} 454 policy-spf unix - n n - - spawn user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf}
452 srs unix n - n - - smtpd 455 srs unix n - n - - smtpd
453 -o sender_canonical_maps = tcp:127.0.0.1:10001
454 -o sender_canonical_classes = envelope_sender
455 -o recipient_canonical_maps = tcp:127.0.0.1:10002 456 -o recipient_canonical_maps = tcp:127.0.0.1:10002
456 -o recipient_canonical_classes = envelope_recipient,header_recipient 457 -o recipient_canonical_classes = envelope_recipient,header_recipient
457 ''; 458 '';