X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab078a62e662030e7e438d2d58904084fbb2a82f..7be9473d2bb0cfc6f839e72ee8ad9ea209067f85:/cookbooks/exim/templates/default/exim4.conf.erb diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb index 8158b8ae0..f81fe5051 100644 --- a/cookbooks/exim/templates/default/exim4.conf.erb +++ b/cookbooks/exim/templates/default/exim4.conf.erb @@ -385,10 +385,6 @@ acl_check_rcpt: deny !hosts = +relay_from_hosts !verify = sender - deny !hosts = +relay_from_hosts - !senders = lsearch*@;/etc/exim4/callout_exempt_senders - !verify = sender/callout/defer_ok - # Accept if the message comes from one of the hosts for which we are an # outgoing relay. It is assumed that such hosts are most likely to be MUAs, # so we set control=submission to make Exim treat the message as a @@ -529,7 +525,7 @@ begin routers system_aliases: driver = redirect - domains = +local_domains + domains = !noreply.openstreetmap.org : +local_domains allow_fail allow_defer data = ${lookup{$local_part}lsearch{/etc/aliases}}