X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/969e1e6d277ef40a24d2cdc33f31f1eaa48752f5..12c1bfbf869c93d0da2999b70f556b39ff71de17:/cookbooks/exim/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 1a82a2273..7354e93d3 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "munin"
 include_recipe "networking"
 include_recipe "prometheus"
 
@@ -126,6 +125,19 @@ file "/etc/exim4/blocked-senders" do
   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")
 
@@ -219,9 +231,6 @@ template "/etc/mail.rc" do
   mode "644"
 end
 
-munin_plugin "exim_mailqueue"
-munin_plugin "exim_mailstats"
-
 prometheus_exporter "exim" do
   port 9636
   user "Debian-exim"
@@ -229,54 +238,36 @@ prometheus_exporter "exim" do
 end
 
 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"
-      dest_ports port
-      source_ports "1024-65535"
-    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
-  smarthosts_inet = []
-  smarthosts_inet6 = []
+  smarthosts = []
 
   search(:node, "exim_smarthost_name:*?").each do |host|
-    smarthosts_inet |= host.ipaddresses(:role => :external, :family => :inet)
-    smarthosts_inet6 |= host.ipaddresses(:role => :external, :family => :inet6)
+    smarthosts |= host.ipaddresses(:role => :external)
   end
 
-  node[:exim][:daemon_smtp_ports].each do |port|
-    firewall_rule "accept-inbound-smtp-#{port}" do
-      action :accept
-      family :inet
-      source "net:#{smarthosts_inet.sort.join(',')}"
-      dest "fw"
-      proto "tcp"
-      dest_ports port
-      source_ports "1024-65535"
-    end
-
-    firewall_rule "accept-inbound-smtp-#{port}" do
-      action :accept
-      family :inet6
-      source "net:#{smarthosts_inet6.sort.join(',')}"
-      dest "fw"
-      proto "tcp"
-      dest_ports port
-      source_ports "1024-65535"
-    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
-    source "fw"
-    dest "net"
-    proto "tcp"
+    context :outgoing
+    protocol :tcp
     dest_ports "smtp"
   end
 end