From 14b9a5eb973f9aff9a847188d2cdc7ea45a6f118 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 11 Sep 2026 17:17:05 +0100
Subject: [PATCH] Modernise spamassassin configuration

---
 cookbooks/spamassassin/recipes/default.rb          |  6 +++---
 .../spamassassin/templates/default/local.cf.erb    |  7 ++++---
 .../default/{spamassassin.erb => spamd.erb}        | 14 +++-----------
 3 files changed, 10 insertions(+), 17 deletions(-)
 rename cookbooks/spamassassin/templates/default/{spamassassin.erb => spamd.erb} (59%)

diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb
index a0ba6de9a..518048dc0 100644
--- a/cookbooks/spamassassin/recipes/default.rb
+++ b/cookbooks/spamassassin/recipes/default.rb
@@ -30,8 +30,8 @@ directory "/var/spool/spamassassin" do
   mode "755"
 end
 
-template "/etc/default/spamassassin" do
-  source "spamassassin.erb"
+template "/etc/default/spamd" do
+  source "spamd.erb"
   owner "root"
   group "root"
   mode "644"
@@ -65,7 +65,7 @@ template "/etc/spamassassin/local.cf" do
   notifies :restart, "service[spamd]"
 end
 
-file "/var/spool/spamassassin/auto_whitelist" do
+file "/var/spool/spamassassin/auto_welcomelist" do
   owner "debian-spamd"
   group "debian-spamd"
   mode "600"
diff --git a/cookbooks/spamassassin/templates/default/local.cf.erb b/cookbooks/spamassassin/templates/default/local.cf.erb
index dc851baf4..47e9bf028 100644
--- a/cookbooks/spamassassin/templates/default/local.cf.erb
+++ b/cookbooks/spamassassin/templates/default/local.cf.erb
@@ -11,7 +11,8 @@ use_auto_whitelist 1
 
 # Set the location for our state files
 bayes_path /var/spool/spamassassin/bayes
-auto_whitelist_path /var/spool/spamassassin/auto_whitelist
+auto_welcomelist_path /var/spool/spamassassin/auto_welcomelist
 
-blacklist_from *@bewertungskanzlei.de
-blacklist_from *@revieweraser-sales.com
+# Block some unwanted addresses                     
+blocklist_from *@bewertungskanzlei.de
+blocklist_from *@revieweraser-sales.com
diff --git a/cookbooks/spamassassin/templates/default/spamassassin.erb b/cookbooks/spamassassin/templates/default/spamd.erb
similarity index 59%
rename from cookbooks/spamassassin/templates/default/spamassassin.erb
rename to cookbooks/spamassassin/templates/default/spamd.erb
index 1f5769d50..7ca086fbb 100644
--- a/cookbooks/spamassassin/templates/default/spamassassin.erb
+++ b/cookbooks/spamassassin/templates/default/spamd.erb
@@ -1,8 +1,5 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-# Change to one to enable spamd
-ENABLED=1
-
 # Options
 # See man spamd for possible options. The -d option is automatically added.
 
@@ -10,18 +7,13 @@ ENABLED=1
 # make sure --max-children is not set to anything higher than 5,
 # unless you know what you're doing.
 
-OPTIONS="--username debian-spamd --nouser-config --max-children=20 --max-spare=5"
+OPTIONS="--username debian-spamd --nouser-config --max-children 20 --max-spare=5 --helper-home-dir"
 
 # Pid file
 # Where should spamd write its PID to file? If you use the -u or
 # --username option above, this needs to be writable by that user.
-# Otherwise, the init script will not be able to shut spamd down.
-PIDFILE="/var/run/spamd.pid"
+# Note that this setting is not used when spamd is managed by systemd
+PIDFILE="/run/spamd.pid"
 
 # Set nice level of spamd
 #NICE="--nicelevel 15"
-
-# Cronjob
-# Set to anything but 0 to enable the cron job to automatically update
-# spamassassin's rules on a nightly basis
-CRON=1
-- 
2.47.3