Drop use of sender callout verification completely
authorTom Hughes <tom@compton.nu>
Fri, 7 Nov 2014 15:46:46 +0000 (15:46 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 7 Nov 2014 15:46:46 +0000 (15:46 +0000)
cookbooks/exim/recipes/default.rb
cookbooks/exim/templates/default/callout_exempt_senders.erb [deleted file]
cookbooks/exim/templates/default/exim4.conf.erb

index b92bc31..0ebf420 100644 (file)
@@ -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 (file)
index 7a16674..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-*@telenav.com
-noreply@github.com
-*@smail.github.com
index 16e4e56..f81fe50 100644 (file)
@@ -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