X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fmail%2Fpostfix.nix;h=4791b418a60d9194c67cf8fa31ebbbaa49d47f60;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=40a95774c40a5b8ba71ebabf6f117b358174dada;hpb=10e597f87ee789e9b3d115e6b6afa6f3fee8155a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index 40a9577..4791b41 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -377,7 +377,12 @@
         ];
         smtpd_recipient_restrictions = "permit_sasl_authenticated,reject";
         milter_macro_daemon_name = "ORIGINATING";
-        smtpd_milters = "unix:${config.myServices.mail.milters.sockets.opendkim}";
+        smtpd_milters = builtins.concatStringsSep "," [
+          # FIXME: put it back when opensmtpd is upgraded and able to
+          # rewrite the from header
+          #"unix:/run/milter_verify_from/verify_from.sock"
+          "unix:${config.myServices.mail.milters.sockets.opendkim}"
+        ];
       };
       destination = ["localhost"];
       # This needs to reverse DNS
@@ -423,7 +428,7 @@
         };
       };
     };
-    security.acme2.certs."mail" = {
+    security.acme.certs."mail" = {
       postRun = ''
         systemctl restart postfix.service
         '';