From: Adam D. Barratt Date: Fri, 11 Oct 2019 19:54:25 +0000 (+0100) Subject: eximconf: also use GREYLIST_LOCAL_PARTS for greylistd X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=4525f6c21ab0a6d9ab7f77e792296ae42c510918 eximconf: also use GREYLIST_LOCAL_PARTS for greylistd In addition to reducing duplication, this also brings the fixes applied to postgrey support in 82efd346ca1500048366eac43d191c1a2a7d01fc to the greylistd checks. Signed-off-by: Adam D. Barratt --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index bc6c523a7..10038ade4 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -781,11 +781,7 @@ check_recipient: defer message = $sender_host_address is not yet authorized to deliver mail from <$sender_address> to <$local_part@$domain>. log_message = greylisted. - local_parts = ${if match_domain{$domain}{+virtual_domains}\ - {${if exists {${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}\ - {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}{$local_part}{}}}{}}}\ - {${lookup{$local_part}lsearch{/etc/exim4/grey_users}{$local_part}{}} : \ - ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-greylist}{$local_part}{}}}} + local_parts = GREYLIST_LOCAL_PARTS !senders = : !hosts = : +debianhosts : WHITELIST : \ ${if exists {/etc/greylistd/whitelist-hosts}\