From 2012763fa907ef6b75ac6d3272f698846e9ecce4 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 4 Mar 2023 12:26:20 +0000 Subject: [PATCH] Allow all mail relays to relay from any host --- cookbooks/exim/recipes/default.rb | 2 +- roles/mail.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 30617cc8e..8c61b2da1 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -85,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 diff --git a/roles/mail.rb b/roles/mail.rb index 9e3f9bdc9..a96a200a8 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -29,7 +29,7 @@ default_attributes( :queue_run_max => 25, :smtp_accept_max => 200, :smarthost_name => "mail.openstreetmap.org", - :smarthost_via => false, + :smarthost_via => nil, :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"], :routes => { :messages => { -- 2.39.5