X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7be9473d2bb0cfc6f839e72ee8ad9ea209067f85..a8942b825af38bee6da538a5a64dcce91c42341a:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 0ebf4206e..1bbd084ee 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") && File.exist?("/etc/ssl/private/exim.key")
+  end
 end
 
 execute "/etc/ssl/certs/exim.pem" do
@@ -47,12 +48,12 @@ 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") && File.exist?("/etc/ssl/private/exim.key")
   end
 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
@@ -60,14 +61,14 @@ 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
 
@@ -85,7 +86,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
-  if details[:status] and account["email"]
+  if details[:status] && account["email"]
     node.default[:exim][:aliases][name] = account["email"]
   end
 end
@@ -93,7 +94,7 @@ end
 if node[:exim][:private_aliases]
   aliases = data_bag_item("exim", "aliases")
 
-  aliases[node[:exim][:private_aliases]].each do |name,address|
+  aliases[node[:exim][:private_aliases]].each do |name, address|
     node.default[:exim][:aliases][name] = address
   end
 end
@@ -143,7 +144,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"