From 43c9825e49d25fbd2c19abcdeb8f73aee8be2a4c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 14 May 2025 10:50:27 +0200 Subject: ... --- hosts/surtr/email/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'hosts/surtr/email') diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index 13b33c7f..4666d1d6 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix @@ -215,7 +215,7 @@ in { smtpd_client_event_limit_exceptions = ""; milter_default_action = "accept"; - smtpd_milters = [config.services.opendkim.socket "local:/run/rspamd/rspamd-milter.sock"]; + smtpd_milters = [config.services.opendkim.socket "local:/run/rspamd/rspamd-milter.sock" "local:/run/postsrsd/postsrsd-milter.sock"]; non_smtpd_milters = [config.services.opendkim.socket "local:/run/rspamd/rspamd-milter.sock"]; alias_maps = ""; @@ -237,11 +237,6 @@ in { ::/0 silent-discard, dsn ''}"; - sender_canonical_maps = "tcp:localhost:${toString config.services.postsrsd.forwardPort}"; - sender_canonical_classes = "envelope_sender"; - recipient_canonical_maps = "tcp:localhost:${toString config.services.postsrsd.reversePort}"; - recipient_canonical_classes = ["envelope_recipient" "header_recipient"]; - virtual_mailbox_domains = ''pgsql:${pkgs.writeText "virtual_mailbox_domains.cf" '' hosts = postgresql:///email dbname = email @@ -366,10 +361,11 @@ in { services.postsrsd = { enable = true; - domain = "surtr.yggdrasil.li"; + domains = [ "surtr.yggdrasil.li" ] ++ concatMap (domain: [".${domain}" domain]) emailDomains; separator = "+"; - excludeDomains = [ "surtr.yggdrasil.li" - ] ++ concatMap (domain: [".${domain}" domain]) emailDomains; + extraConfig = '' + milter = unix:/run/postsrsd/postsrsd-milter.sock + ''; }; services.opendkim = { -- cgit v1.2.3