1 files changed, 5 insertions, 3 deletions

diff --git a/hel.nix b/hel.nix
index 41bb128e..d88d9db1 100644
--- a/hel.nix
+++ b/hel.nix
@@ -190,7 +190,8 @@
       relayHost = "uucp:ymir";
       recipientDelimiter = "+";
       extraMasterConf = ''
-        uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a$sender - $nexthop!rmail ($recipient)
+        uucp        unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a$sender - $nexthop!rmail ($recipient)
+        sshsendmail unix - n n - - pipe falgs=Fqhu user=postfix argv=${pkgs.openssh}/bin/ssh -F /var/db/postfix/ssh.config $nexthop sendmail -f$sender ($recipient)
       '';
       extraConfig = ''
         default_transport = uucp:ymir
@@ -202,9 +203,10 @@
 
         smtp_sender_dependent_authentication = yes
         sender_dependent_default_transport_maps = regexp:${pkgs.writeText "sender_relay" ''
-          #/@math(ematik)?\.(lmu|uni-muenchen)\.de$/ smtp:wapmail.mathematik.uni-muenchen.de
+          /@math(ematik)?\.(lmu|uni-muenchen)\.de$/ sshsendmail:math60.mathinst.loc
+          /@(cip|stud)\.ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtp.ifi.lmu.de
         ''}
-        smtp_sasl_password_maps = texthash:/var/db/postfix/conf/sasl_passwd
+        smtp_sasl_password_maps = texthash:/var/db/postfix/sasl_passwd
         smtp_sasl_type = cyrus
         smtp_sasl_auth_enable = yes