X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d63e6e2745e70150af2c3cad0efd09b126f4cfc2..2012763fa907ef6b75ac6d3272f698846e9ecce4:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index a9f6472e6..8c61b2da1 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -19,17 +19,26 @@
 
 include_recipe "munin"
 include_recipe "networking"
+include_recipe "prometheus"
 
 package %w[
   exim4
   openssl
   ssl-cert
+  mailutils
 ]
 
 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"
@@ -53,7 +62,7 @@ else
     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]
@@ -76,7 +85,7 @@ 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|
+  search(:node, "exim_smarthost_via:*?").each do |host|
     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 
@@ -86,7 +95,7 @@ if node[:exim][:smarthost_name]
   directory "/srv/mta-sts.#{primary_domain}" do
     owner "root"
     group "root"
-    mode 0o755
+    mode "755"
   end
 
   domains.each do |domain|
@@ -94,7 +103,7 @@ if node[:exim][:smarthost_name]
       source "mta-sts.erb"
       owner "root"
       group "root"
-      mode 0o644
+      mode "644"
       variables :domain => domain
     end
   end
@@ -114,7 +123,7 @@ end
 file "/etc/exim4/blocked-senders" do
   owner "root"
   group "Debian-exim"
-  mode 0o644
+  mode "644"
 end
 
 if node[:exim][:dkim_selectors]
@@ -124,20 +133,20 @@ if node[:exim][:dkim_selectors]
     owner "root"
     source "dkim-domains.erb"
     group "Debian-exim"
-    mode 0o644
+    mode "644"
   end
 
   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"
-    mode 0o755
+    mode "755"
   end
 
   node[:exim][:dkim_selectors].each do |domain, _selector|
@@ -145,16 +154,24 @@ if node[:exim][:dkim_selectors]
       content keys[domain].join("\n")
       owner "root"
       group "Debian-exim"
-      mode 0o640
+      mode "640"
     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"
-  mode 0o644
+  mode "644"
   variables :relay_to_domains => relay_to_domains.sort,
             :relay_from_hosts => relay_from_hosts.sort
   notifies :restart, "service[exim4]"
@@ -181,23 +198,36 @@ template "/etc/aliases" do
   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"
-  mode 0o755
+  mode "755"
   files_owner "root"
   files_group "Debian-exim"
-  files_mode 0o755
+  files_mode "755"
   purge true
 end
 
+template "/etc/mail.rc" do
+  source "mail.rc.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 munin_plugin "exim_mailqueue"
 munin_plugin "exim_mailstats"
 
+prometheus_exporter "exim" do
+  port 9636
+  user "Debian-exim"
+  protect_proc "default"
+end
+
 if node[:exim][:smarthost_name]
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do