X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9012bc5377524e0a9e8222267b927e2413dd9bcd..ff044920428608b2c04507ad52d6ab52c9d6555f:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 06bc08540..abf404303 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "networking"
 
 package "exim4"
 package "openssl"
+package "ssl-cert"
 
 if File.exist?("/var/run/clamav/clamd.ctl")
   package "exim4-daemon-heavy"
@@ -37,9 +38,9 @@ template "/tmp/exim.ssl.cnf" do
   owner "root"
   group "root"
   mode 0644
-   not_if do
-    File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key")
-  end 
+  not_if do
+    File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key")
+  end
 end
 
 execute "/etc/ssl/certs/exim.pem" do
@@ -47,7 +48,7 @@ execute "/etc/ssl/certs/exim.pem" do
   user "root"
   group "ssl-cert"
   not_if do
-    File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key")
+    File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key")
   end
 end
 
@@ -60,7 +61,7 @@ end
 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]
@@ -81,13 +82,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] || {}
@@ -126,7 +120,7 @@ end
 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
@@ -137,6 +131,17 @@ if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
       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]