From 28c9d667446c431665aa8883e993208893c93487 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 11 Sep 2026 17:35:21 +0100 Subject: [PATCH] Really treat podman addresses as trusted by spamassassin --- cookbooks/spamassassin/recipes/default.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index 518048dc0..d1acb6b04 100644 --- a/cookbooks/spamassassin/recipes/default.rb +++ b/cookbooks/spamassassin/recipes/default.rb @@ -38,15 +38,17 @@ template "/etc/default/spamd" do notifies :restart, "service[spamd]" end -trusted_networks = node[:exim][:relay_from_hosts] +trusted_networks = node[:exim][:relay_from_hosts] - ["127.0.0.1", "::1"] if node[:exim][:smarthost_name] search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host| - trusted_networks |= host.ipaddresses(:role => :external) + host.ipaddresses(:role => :external).each do |address| + trusted_networks << address.to_s + end end end -trusted_networks -= ["127.0.0.1", "::1", "10.88.0.0/16"] +trusted_networks << "10.88.0.0/16" template "/etc/spamassassin/local.pre" do source "local.pre.erb" -- 2.47.3