Get time from the database, because we're comparing it to database times. Sort of.

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 49568984183f31661b27a0e66c47190a367960b8..4e7c4638ba86a07e691048b4ce4a99cff0336b5a 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -37,9 +37,9 @@ template "/tmp/exim.ssl.cnf" do
   source "ssl.cnf.erb"
   owner "root"
   group "root"
   source "ssl.cnf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   not_if do
   not_if do

-    File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key")
+    File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")

   end
 end
 
   end
 end
 


@@ -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.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/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,14 +61,14 @@ 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
 


@@ -76,7 +76,7 @@ template "/etc/exim4/exim4.conf" do
   source "exim4.conf.erb"
   owner "root"
   group "Debian-exim"
   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 +86,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


@@ -103,17 +103,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 +144,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"