Merge remote-tracking branch 'github/pull/704'

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

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 9266425e3a64c319948fb9a4d0337fa4db345239..7354e93d363d2daf763cfc096213db53f7e3e6a1 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -17,19 +17,27 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "munin"

 include_recipe "networking"
 include_recipe "networking"

+include_recipe "prometheus"

 
 package %w[
   exim4
   openssl
   ssl-cert
 
 package %w[
   exim4
   openssl
   ssl-cert

+  mailutils

 ]
 
 package "exim4-daemon-heavy" do
   only_if { ::File.exist?("/var/run/clamav/clamd.ctl") }
 end
 
 ]
 
 package "exim4-daemon-heavy" do
   only_if { ::File.exist?("/var/run/clamav/clamd.ctl") }
 end
 

+group "Debian-exim" do
+  action :modify
+  members "clamav"
+  append true
+  only_if { ::File.exist?("/var/run/clamav/clamd.ctl") }
+end
+

 group "ssl-cert" do
   action :modify
   members "Debian-exim"
 group "ssl-cert" do
   action :modify
   members "Debian-exim"


@@ -53,7 +61,7 @@ else
     key_file "/etc/ssl/private/exim.key"
     owner "root"
     group "ssl-cert"
     key_file "/etc/ssl/private/exim.key"
     owner "root"
     group "ssl-cert"

-    mode 0o640
+    mode "640"

     org "OpenStreetMap"
     email "postmaster@openstreetmap.org"
     common_name node[:fqdn]
     org "OpenStreetMap"
     email "postmaster@openstreetmap.org"
     common_name node[:fqdn]


@@ -76,7 +84,7 @@ end
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
 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|
+  search(:node, "exim_smarthost_via:*?").each do |host|

     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 
     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 


@@ -86,7 +94,7 @@ if node[:exim][:smarthost_name]
   directory "/srv/mta-sts.#{primary_domain}" do
     owner "root"
     group "root"
   directory "/srv/mta-sts.#{primary_domain}" do
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 
   domains.each do |domain|
   end
 
   domains.each do |domain|


@@ -94,7 +102,7 @@ if node[:exim][:smarthost_name]
       source "mta-sts.erb"
       owner "root"
       group "root"
       source "mta-sts.erb"
       owner "root"
       group "root"

-      mode 0o644
+      mode "644"

       variables :domain => domain
     end
   end
       variables :domain => domain
     end
   end


@@ -114,40 +122,68 @@ end
 file "/etc/exim4/blocked-senders" do
   owner "root"
   group "Debian-exim"
 file "/etc/exim4/blocked-senders" do
   owner "root"
   group "Debian-exim"

-  mode 0o644
+  mode "644"
+end
+
+file "/etc/exim4/blocked-sender-domains" do
+  owner "root"
+  group "Debian-exim"
+  mode "644"
+end
+
+file "/etc/exim4/detaint" do
+  owner "root"
+  group "Debian-exim"
+  mode "644"
+  content "*"

 end
 
 if node[:exim][:dkim_selectors]
   keys = data_bag_item("exim", "dkim")
 
 end
 
 if node[:exim][:dkim_selectors]
   keys = data_bag_item("exim", "dkim")
 

+  template "/etc/exim4/dkim-domains" do
+    owner "root"
+    source "dkim-domains.erb"
+    group "Debian-exim"
+    mode "644"
+  end
+

   template "/etc/exim4/dkim-selectors" do
     owner "root"
     source "dkim-selectors.erb"
     group "Debian-exim"
   template "/etc/exim4/dkim-selectors" do
     owner "root"
     source "dkim-selectors.erb"
     group "Debian-exim"

-    mode 0o644
+    mode "644"

   end
 
   directory "/etc/exim4/dkim-keys" do
     owner "root"
     group "Debian-exim"
   end
 
   directory "/etc/exim4/dkim-keys" do
     owner "root"
     group "Debian-exim"

-    mode 0o755
+    mode "755"

   end
 
   end
 

-  node[:exim][:dkim_selectors].each do |domain, selector|
+  node[:exim][:dkim_selectors].each do |domain, _selector|

     file "/etc/exim4/dkim-keys/#{domain}" do
       content keys[domain].join("\n")
       owner "root"
       group "Debian-exim"
     file "/etc/exim4/dkim-keys/#{domain}" do
       content keys[domain].join("\n")
       owner "root"
       group "Debian-exim"

-      mode 0o640
+      mode "640"

     end
   end
 end
 
     end
   end
 end
 

+template "/etc/default/exim4" do
+  source "default.erb"
+  owner "root"
+  group "root"
+  mode "044"
+  notifies :restart, "service[exim4]"
+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 0o644
+  mode "644"

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


@@ -174,53 +210,64 @@ template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
   group "root"
   source "aliases.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 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 0o755
+  mode "755"

   files_owner "root"
   files_group "Debian-exim"
   files_owner "root"
   files_group "Debian-exim"

-  files_mode 0o755
+  files_mode "755"

   purge true
 end
 
   purge true
 end
 

-munin_plugin "exim_mailqueue"
-munin_plugin "exim_mailstats"
+template "/etc/mail.rc" do
+  source "mail.rc.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+prometheus_exporter "exim" do
+  port 9636
+  user "Debian-exim"
+  protect_proc "default"
+end

 
 if node[:exim][:smarthost_name]
 
 if node[:exim][:smarthost_name]

-  node[:exim][:daemon_smtp_ports].each do |port|
-    firewall_rule "accept-inbound-smtp-#{port}" do
-      action :accept
-      source "net"
-      dest "fw"
-      proto "tcp:syn"
-      dest_ports port
-      source_ports "1024:"
-    end
+  firewall_rule "accept-inbound-smtp" do
+    action :accept
+    context :incoming
+    protocol :tcp
+    dest_ports node[:exim][:daemon_smtp_ports]
+    source_ports "1024-65535"

   end
 else
   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
+  smarthosts = []
+
+  search(:node, "exim_smarthost_name:*?").each do |host|
+    smarthosts |= host.ipaddresses(:role => :external)
+  end
+
+  firewall_rule "accept-inbound-smtp" do
+    action :accept
+    context :incoming
+    protocol :tcp
+    source smarthosts
+    dest_ports node[:exim][:daemon_smtp_ports]
+    source_ports "1024-65535"
+    not_if { smarthosts.empty? }

   end
 end
 
 if node[:exim][:smarthost_via]
   firewall_rule "deny-outbound-smtp" do
     action :reject
   end
 end
 
 if node[:exim][:smarthost_via]
   firewall_rule "deny-outbound-smtp" do
     action :reject

-    source "fw"
-    dest "net"
-    proto "tcp:syn"
+    context :outgoing
+    protocol :tcp

     dest_ports "smtp"
   end
 end
     dest_ports "smtp"
   end
 end