X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/97baa72d45f054030c0571d02014ce8d3cb37aae..a59843c11d4c7b20b9a652b624f5fec79f57cfca:/cookbooks/exim/recipes/default.rb

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index e8e333b9b..789c4e253 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -25,6 +25,7 @@ package %w[
   exim4
   openssl
   ssl-cert
+  mailutils
 ]
 
 package "exim4-daemon-heavy" do
@@ -84,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
 
@@ -211,11 +212,20 @@ remote_directory "/etc/exim4/noreply" do
   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]
@@ -230,10 +240,29 @@ if node[:exim][:smarthost_name]
     end
   end
 else
+  smarthosts_inet = []
+  smarthosts_inet6 = []
+
+  search(:node, "exim_smarthost_name:*?").each do |host|
+    smarthosts_inet |= host.ipaddresses(:role => :external, :family => :inet)
+    smarthosts_inet6 |= host.ipaddresses(:role => :external, :family => :inet6)
+  end
+
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept
-      source "bm:mail.openstreetmap.org"
+      family :inet
+      source "net:#{smarthosts_inet.sort.join(',')}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports port
+      source_ports "1024:"
+    end
+
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      family :inet6
+      source "net:#{smarthosts_inet6.sort.join(',')}"
       dest "fw"
       proto "tcp:syn"
       dest_ports port