Drop use of sender callout verification completely

[chef.git] / cookbooks / exim / recipes / default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 219629f592a997e3a14c04c863694732fb3a6b96..0ebf4206e79b4ee0cfe5094e7fcf23ac3dd1ed6d 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -60,7 +60,7 @@ end
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|

-  relay_to_domains = relay_to_domains | route[:domains]
+  relay_to_domains = relay_to_domains | route[:domains] if route[:host]

 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]
 end
 
 relay_from_hosts = node[:exim][:relay_from_hosts]


@@ -78,7 +78,7 @@ template "/etc/exim4/exim4.conf" do
   mode 0644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   mode 0644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort

-  notifies :restart, resources(:service => "exim4")
+  notifies :restart, "service[exim4]"

 end
 
 search(:accounts, "*:*").each do |account|
 end
 
 search(:accounts, "*:*").each do |account|


@@ -119,7 +119,7 @@ end
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 

-if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
+if node[:exim][:smarthost_name]

   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept


@@ -130,6 +130,17 @@ if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
       source_ports "1024:"
     end
   end
       source_ports "1024:"
     end
   end

+else
+  node[:exim][:daemon_smtp_ports].each do |port|
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      source "bm:mail.openstreetmap.org"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports port
+      source_ports "1024:"
+    end
+  end

 end
 
 if node[:exim][:smarthost_via]
 end
 
 if node[:exim][:smarthost_via]