just use srs on all domains for now

1 files changed, 3 insertions, 5 deletions

diff --git a/ymir.nix b/ymir.nix
index 6dd238da..7acda6b0 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -388,7 +388,6 @@ in rec {
         /^gkleen[@\+]/ uucp:isaac
         /@(lists?|l)\./ mlmmj:
         /@subs?\.(lists?|l)\./ mlmmj-subs:
-        /@srs\.141\.li$/ smtp:localhost:10003
       ''}
 
       luser_relay = gkleen+''${local}
@@ -446,22 +445,21 @@ in rec {
 
       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}
-      localhost:10003 inet n - n - - smtpd
-          -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"];
   };
 
   services.postsrsd = {
     enable = true;
-    domain = "srs.141.li";
+    domain = "141.li";
   };
 
   systemd.timers."mlmmj-maintd" = {