1 files changed, 5 insertions, 5 deletions

diff --git a/hosts/sif/mail/default.nix b/hosts/sif/mail/default.nix
index 2addba9d..29bfb4f1 100644
--- a/hosts/sif/mail/default.nix
+++ b/hosts/sif/mail/default.nix
@@ -38,23 +38,23 @@
         /@ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtpin1.ifi.lmu.de:587
         /@(campus\.)?lmu\.de$/ smtp:postout.lrz.de
       ''}'';
-      sender_bcc_maps = ''texthash:${pkgs.writeText "sender_bcc" ''
-        uni2work@ifi.lmu.de uni2work@ifi.lmu.de
-        @ifi.lmu.de gregor.kleen@ifi.lmu.de
+      sender_bcc_maps = ''regexp:${pkgs.writeText "sender_bcc" ''
+        /^uni2work(-[^@]*)?@ifi\.lmu\.de$/ uni2work@ifi.lmu.de
+        /@ifi\.lmu\.de$/ gregor.kleen@ifi.lmu.de
       ''}'';
 
       smtp_sasl_auth_enable = true;
       smtp_sender_dependent_authentication = true;
       smtp_sasl_tls_security_options = "noanonymous";
       smtp_sasl_mechanism_filter = ["plain"];
-      smtp_sasl_password_maps = "texthash:/var/db/postfix/sasl_passwd";
+      smtp_sasl_password_maps = "regexp:/var/db/postfix/sasl_passwd";
       smtp_cname_overrides_servername = false;
       smtp_always_send_ehlo = true;
+      smtp_tls_security_level = "dane";
 
       smtp_tls_loglevel = "1";
       smtp_dns_support_level = "dnssec";
     };
-    useDane = true;
   };
 
   sops.secrets.postfix-sasl-passwd = {