Fix icmp echo rate limiting

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 30617cc8e3da18a4877fba292dae0353ef52dd19..1a82a22733cbfd2c5425e99d920e958dd45d9416 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -85,7 +85,7 @@ end
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]

-  search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|
+  search(:node, "exim_smarthost_via:*?").each do |host|

     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 
     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 


@@ -234,20 +234,39 @@ if node[:exim][:smarthost_name]
       action :accept
       source "net"
       dest "fw"
       action :accept
       source "net"
       dest "fw"

-      proto "tcp:syn"
+      proto "tcp"

       dest_ports port
       dest_ports port

-      source_ports "1024:"
+      source_ports "1024-65535"

     end
   end
 else
     end
   end
 else

+  smarthosts_inet = []
+  smarthosts_inet6 = []
+
+  search(:node, "exim_smarthost_name:*?").each do |host|
+    smarthosts_inet |= host.ipaddresses(:role => :external, :family => :inet)
+    smarthosts_inet6 |= host.ipaddresses(:role => :external, :family => :inet6)
+  end
+

   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

-      source "bm:mail.openstreetmap.org"
+      family :inet
+      source "net:#{smarthosts_inet.sort.join(',')}"
+      dest "fw"
+      proto "tcp"
+      dest_ports port
+      source_ports "1024-65535"
+    end
+
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      family :inet6
+      source "net:#{smarthosts_inet6.sort.join(',')}"

       dest "fw"
       dest "fw"

-      proto "tcp:syn"
+      proto "tcp"

       dest_ports port
       dest_ports port

-      source_ports "1024:"
+      source_ports "1024-65535"

     end
   end
 end
     end
   end
 end


@@ -257,7 +276,7 @@ if node[:exim][:smarthost_via]
     action :reject
     source "fw"
     dest "net"
     action :reject
     source "fw"
     dest "net"

-    proto "tcp:syn"
+    proto "tcp"

     dest_ports "smtp"
   end
 end
     dest_ports "smtp"
   end
 end