From 7be9473d2bb0cfc6f839e72ee8ad9ea209067f85 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 7 Nov 2014 15:46:46 +0000 Subject: [PATCH 1/1] Drop use of sender callout verification completely --- cookbooks/exim/recipes/default.rb | 7 ------- .../exim/templates/default/callout_exempt_senders.erb | 3 --- cookbooks/exim/templates/default/exim4.conf.erb | 4 ---- 3 files changed, 14 deletions(-) delete mode 100644 cookbooks/exim/templates/default/callout_exempt_senders.erb diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index b92bc31f4..0ebf4206e 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -81,13 +81,6 @@ template "/etc/exim4/exim4.conf" do notifies :restart, "service[exim4]" end -template "/etc/exim4/callout_exempt_senders" do - source "callout_exempt_senders.erb" - owner "root" - group "Debian-exim" - mode 0644 -end - search(:accounts, "*:*").each do |account| name = account["id"] details = node[:accounts][:users][name] || {} diff --git a/cookbooks/exim/templates/default/callout_exempt_senders.erb b/cookbooks/exim/templates/default/callout_exempt_senders.erb deleted file mode 100644 index 7a16674a0..000000000 --- a/cookbooks/exim/templates/default/callout_exempt_senders.erb +++ /dev/null @@ -1,3 +0,0 @@ -*@telenav.com -noreply@github.com -*@smail.github.com diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb index 16e4e56d7..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 -- 2.43.2