X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/63028ad351365c5ce709c7e00883a74dd9391382..1b2c429da3de1e8d5a077027e1f90a4114652d2a:/cookbooks/exim/templates/default/exim4.conf.erb?ds=sidebyside diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb index 16e4e56d7..e73ad857d 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 @@ -707,6 +703,7 @@ noreply: driver = pipe command = <%= details[:command] %> home_directory = <%= details[:home_directory] %> + path = <%= details[:path] || "/bin:/usr/bin" %> return_output <% else -%> driver = appendfile