Fix test failures

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index e8e333b9bcc27da22c72db47b3767d78995e8b43..dbf90bdfb4554397df2cb54b0295214089da10d8 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -25,6 +25,7 @@ package %w[
   exim4
   openssl
   ssl-cert
   exim4
   openssl
   ssl-cert

+  mailutils

 ]
 
 package "exim4-daemon-heavy" do
 ]
 
 package "exim4-daemon-heavy" do


@@ -84,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
 


@@ -211,11 +212,20 @@ remote_directory "/etc/exim4/noreply" do
   purge true
 end
 
   purge true
 end
 

+template "/etc/mail.rc" do
+  source "mail.rc.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+

 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
 prometheus_exporter "exim" do
   port 9636
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
 prometheus_exporter "exim" do
   port 9636

+  user "Debian-exim"
+  protect_proc "default"

 end
 
 if node[:exim][:smarthost_name]
 end
 
 if node[:exim][:smarthost_name]


@@ -224,20 +234,41 @@ 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"
+      not_if { smarthosts_inet.empty? }
+    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"
+      not_if { smarthosts_inet6.empty? }

     end
   end
 end
     end
   end
 end


@@ -247,7 +278,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