From f1634e60a4b74297bb7875d847f7d7c0660ca024 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 5 May 2022 16:58:26 +0200
Subject: surtr: ...

---
 hosts/surtr/email/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'hosts')

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index cf0be070..68690d55 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -126,7 +126,7 @@ with lib;
             "-o" "smtpd_client_restrictions=permit_tls_all_clientcerts,reject"
             "-o" "smtpd_relay_restrictions=permit_tls_all_clientcerts,reject"
             "-o" "smtpd_recipient_restrictions=reject_unauth_pipelining,reject_non_fqdn_recipient,reject_unknown_recipient_domain,permit_tls_all_clientcerts,reject"
-            "-o" "{ smtpd_milters = {${config.services.opendkim.socket}, milter_mail_macros = \"i EXTERNAL {cert_subject} {cert_subject} {mail_addr} {mail_host} {mail_mailer}\"} }"
+            "-o" "milter_macro_daemon_name=surtr.yggdrasil.li"
           ];
         };
       };
@@ -149,6 +149,7 @@ with lib;
       selector = "surtr";
       configFile = builtins.toFile "opendkim.conf" ''
         Syslog true
+        MTA surtr.yggdrasil.li
         MTACommand ${config.security.wrapperDir}/sendmail
         LogResults true
       '';
-- 
cgit v1.2.3