Qualify property names

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index af0070bd94dfc67c2a2c33a9d467ead5f06fa234..144b62bb37b1ca6194fa473e4ef289407be1cc2a 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -19,13 +19,13 @@
 
 include_recipe "networking"
 
 
 include_recipe "networking"
 

-package "exim4"
-package "openssl"
-package "ssl-cert"
+package %w[
+  exim4
+  openssl
+  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
 
 group "ssl-cert" do
   action :modify


@@ -37,10 +37,10 @@ template "/tmp/exim.ssl.cnf" do
   source "ssl.cnf.erb"
   owner "root"
   group "root"
   source "ssl.cnf.erb"
   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 
+  mode 0o644
+  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
 end
 
 execute "/etc/ssl/certs/exim.pem" do


@@ -48,12 +48,12 @@ execute "/etc/ssl/certs/exim.pem" do
   user "root"
   group "ssl-cert"
   not_if 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
   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
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "execute[/etc/ssl/certs/exim.pem]"
 end


@@ -61,22 +61,28 @@ end
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
 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|
 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
 
   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"
 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]"
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   notifies :restart, "service[exim4]"


@@ -86,7 +92,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
   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
     node.default[:exim][:aliases][name] = account["email"]
   end
 end


@@ -94,7 +100,7 @@ end
 if node[:exim][:private_aliases]
   aliases = data_bag_item("exim", "aliases")
 
 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
     node.default[:exim][:aliases][name] = address
   end
 end


@@ -103,17 +109,17 @@ template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
   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"
 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_owner "root"
   files_group "Debian-exim"

-  files_mode 0755
+  files_mode 0o755

   purge true
 end
 
   purge true
 end
 


@@ -144,7 +150,7 @@ else
   end
 end
 
   end
 end
 

-if node[:exim][:smarthost_via]
+if node[:exim][:smarthost_via] # ~FC023

   firewall_rule "deny-outbound-smtp" do
     action :reject
     source "fw"
   firewall_rule "deny-outbound-smtp" do
     action :reject
     source "fw"