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 7c9dc6887886f9f2589cb4f3fdef8184da2a2f1a..4e7c4638ba86a07e691048b4ce4a99cff0336b5a 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -18,9 +18,10 @@
 #
 
 include_recipe "networking"
 #
 
 include_recipe "networking"

-include_recipe "ssl"

 
 package "exim4"
 
 package "exim4"

+package "openssl"
+package "ssl-cert"

 
 if File.exist?("/var/run/clamav/clamd.ctl")
   package "exim4-daemon-heavy"
 
 if File.exist?("/var/run/clamav/clamd.ctl")
   package "exim4-daemon-heavy"


@@ -32,24 +33,42 @@ group "ssl-cert" do
   append true
 end
 
   append true
 end
 

+template "/tmp/exim.ssl.cnf" do
+  source "ssl.cnf.erb"
+  owner "root"
+  group "root"
+  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
+  command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/exim.key -out /etc/ssl/certs/exim.pem -days 3650 -nodes -config /tmp/exim.ssl.cnf"
+  user "root"
+  group "ssl-cert"
+  not_if do
+    File.exist?("/etc/ssl/certs/exim.pem") && File.exist?("/etc/ssl/private/exim.key")
+  end
+end
+

 service "exim4" do
 service "exim4" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   supports :status => true, :restart => true, :reload => true

-  subscribes :restart, resources(:cookbook_file => "/etc/ssl/certs/openstreetmap.pem")
-  subscribes :restart, resources(:file => "/etc/ssl/private/openstreetmap.key")
+  subscribes :restart, "execute[/etc/ssl/certs/exim.pem]"

 end
 
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|
 end
 
 relay_to_domains = node[:exim][:relay_to_domains]
 
 node[:exim][:routes].each_value do |route|

-  relay_to_domains = relay_to_domains | route[:domains]
+  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
 


@@ -57,43 +76,51 @@ 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
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort

-  notifies :restart, resources(:service => "exim4")
+  notifies :restart, "service[exim4]"

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

+if node[:exim][:private_aliases]
+  aliases = data_bag_item("exim", "aliases")
+
+  aliases[node[:exim][:private_aliases]].each do |name, address|
+    node.default[:exim][:aliases][name] = address
+  end
+end
+

 template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
 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"
 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
 
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
   purge true
 end
 
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 

-if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
+if node[:exim][:smarthost_name]

   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept


@@ -104,9 +131,20 @@ if not relay_to_domains.empty? or not node[:exim][:local_domains].empty?
       source_ports "1024:"
     end
   end
       source_ports "1024:"
     end
   end

+else
+  node[:exim][:daemon_smtp_ports].each do |port|
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      source "bm:mail.openstreetmap.org"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports port
+      source_ports "1024:"
+    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"