X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..c45b10b52d55b1eda30d25595ae605bfaabac7b6:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index c334f9ced..a74e4d6a5 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -23,9 +23,7 @@ package "exim4"
 package "openssl"
 package "ssl-cert"
 
-if File.exist?("/var/run/clamav/clamd.ctl")
-  package "exim4-daemon-heavy"
-end
+package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl")
 
 group "ssl-cert" do
   action :modify
@@ -37,7 +35,7 @@ template "/tmp/exim.ssl.cnf" do
   source "ssl.cnf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   not_if do
     File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
   end
@@ -53,7 +51,7 @@ execute "/etc/ssl/certs/exim.pem" do
 end
 
 service "exim4" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "execute[/etc/ssl/certs/exim.pem]"
 end
@@ -61,22 +59,28 @@ end
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
-  relay_to_domains = relay_to_domains | route[:domains] if route[:host]
+  relay_to_domains |= route[:domains] if route[:host]
 end
 
 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|
-    relay_from_hosts = relay_from_hosts | host.ipaddresses(:role => :external)
+    relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 end
 
+file "/etc/exim4/blocked-senders" do
+  owner "root"
+  group "Debian-exim"
+  mode 0o644
+end
+
 template "/etc/exim4/exim4.conf" do
   source "exim4.conf.erb"
   owner "root"
   group "Debian-exim"
-  mode 0644
+  mode 0o644
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   notifies :restart, "service[exim4]"
@@ -103,17 +107,17 @@ template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 remote_directory "/etc/exim4/noreply" do
   source "noreply"
   owner "root"
   group "Debian-exim"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "Debian-exim"
-  files_mode 0755
+  files_mode 0o755
   purge true
 end
 
@@ -144,7 +148,7 @@ else
   end
 end
 
-if node[:exim][:smarthost_via]
+if node[:exim][:smarthost_via] # ~FC023
   firewall_rule "deny-outbound-smtp" do
     action :reject
     source "fw"