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 da8ba5c9cb981a3aabe96ba30f5a901bfd50355d..4e7c4638ba86a07e691048b4ce4a99cff0336b5a 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -37,7 +37,7 @@ 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
     File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
   end
   not_if do
     File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
   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]"


@@ -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"