From 52725a888cb3d9db2400b5a54b324318ddb572c5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sun, 23 Jan 2022 10:26:15 +0100 Subject: [PATCH] use %u instead of %s --- rootfs/etc/confd/templates/main.cf.tmpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rootfs/etc/confd/templates/main.cf.tmpl b/rootfs/etc/confd/templates/main.cf.tmpl index 37aaeb6..e3c6081 100644 --- a/rootfs/etc/confd/templates/main.cf.tmpl +++ b/rootfs/etc/confd/templates/main.cf.tmpl @@ -63,7 +63,10 @@ smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_u smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination, reject_unverified_recipient smtpd_sender_restrictions = reject_sender_login_mismatch -smtpd_sender_login_maps = pgsql:/etc/postfix/pgsql-login-maps.cf +smtpd_sender_login_maps = unionmap:{ + $virtual_mailbox_maps, + pgsql:/etc/postfix/pgsql-login-maps.cf +} smtpd_milters={{getenv "RSPAMD_ADDRESS" "inet:127.0.0.1:11332"}} non_smtpd_milters=$smtpd_milters