SRS only on correct domain (maybe)

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 {
         /^gkleen[@\+]/ uucp:isaac
         /@(lists?|l)\./ mlmmj:
         /@subs?\.(lists?|l)\./ mlmmj-subs:
+        /@srs\./ srs:
       ''}
 
       luser_relay = gkleen+''${local}
@@ -442,17 +443,17 @@ 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
-      recipient_canonical_maps = tcp:127.0.0.1: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)
       mlmmj      unix - n n - - pipe  flags=ORhu user=mlmmj  argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L /var/spool/lists/''${user}
       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
     '';
     networks = ["127.0.0.0/8" "[::ffff:127.0.0.0]/104" "[::1]/128" "10.141.0.0/16"];
   };