summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/ymir.nix b/ymir.nix
index 69501d02..cfa576f0 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -388,6 +388,7 @@ in rec {
388 /^gkleen[@\+]/ uucp:isaac 388 /^gkleen[@\+]/ uucp:isaac
389 /@(lists?|l)\./ mlmmj: 389 /@(lists?|l)\./ mlmmj:
390 /@subs?\.(lists?|l)\./ mlmmj-subs: 390 /@subs?\.(lists?|l)\./ mlmmj-subs:
391 /@srs\./ srs:
391 ''} 392 ''}
392 393
393 luser_relay = gkleen+''${local} 394 luser_relay = gkleen+''${local}
@@ -442,17 +443,17 @@ in rec {
442 non_smtpd_milters = local:private/dkim 443 non_smtpd_milters = local:private/dkim
443 444
444 alias_maps = hash:/etc/postfix/aliases texthash:/srv/mail/spm 445 alias_maps = hash:/etc/postfix/aliases texthash:/srv/mail/spm
445
446 sender_canonical_maps = tcp:127.0.0.1:10001
447 sender_canonical_classes = envelope_sender
448 recipient_canonical_maps = tcp:127.0.0.1:10002
449 recipient_canonical_classes = envelope_recipient,header_recipient
450 ''; 446 '';
451 extraMasterConf = '' 447 extraMasterConf = ''
452 uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient) 448 uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a $sender - $nexthop!rmail ($recipient)
453 mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user} 449 mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}
454 mlmmj-subs unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension} 450 mlmmj-subs unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj-exposed}/bin/mlmmj-exposed /var/spool/lists/''${user} ''${extension}
455 policy-spf unix - n n - - spawn user=nobody argv=${pkgs.pythonPackages.pypolicyd-spf}/bin/policyd-spf ${./ymir/spf.conf} 451 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
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_classes = envelope_recipient,header_recipient
456 ''; 457 '';
457 networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"]; 458 networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"];
458 }; 459 };