From c16855916d15680835e4652e97a38c0b3392ffec Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 15 Mar 2021 14:21:38 +0100
Subject: [PATCH] spamassassin: update templates according to bullseye's
defaults
---
spamassassin/templates/local.cf.j2 | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/spamassassin/templates/local.cf.j2 b/spamassassin/templates/local.cf.j2
index 17499af..012c32e 100644
--- a/spamassassin/templates/local.cf.j2
+++ b/spamassassin/templates/local.cf.j2
@@ -9,7 +9,7 @@
# Add *****SPAM***** to the Subject header of spam e-mails
#
-{{ '' if spamassassin_rewrite_subject else '#' }}rewrite_header Subject *****SPAM*****
+{{ '' if spamassassin_rewrite_subject else '# ' }}rewrite_header Subject *****SPAM*****
# Save spam messages as a message/rfc822 MIME attachment instead of
@@ -57,6 +57,22 @@ required_score {{ spamassassin_required_score }}
#
# normalize_charset 1
+# Textual body scan limit (default: 50000)
+#
+# Amount of data per email text/* mimepart, that will be run through body
+# rules. This enables safer and faster scanning of large messages,
+# perhaps having very large textual attachments. There should be no need
+# to change this well tested default.
+#
+# body_part_scan_size 50000
+
+# Textual rawbody data scan limit (default: 500000)
+#
+# Amount of data per email text/* mimepart, that will be run through
+# rawbody rules.
+#
+# rawbody_part_scan_size 500000
+
# Some shortcircuiting, if the plugin is enabled
#
ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
@@ -65,6 +81,10 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
# shortcircuiting plugin is active, causing early exit to save CPU load.
# Uncomment to turn this on
#
+# SpamAssassin tries hard not to launch DNS queries before priority -100.
+# If you want to shortcircuit without launching unneeded queries, make
+# sure such rule priority is below -100. These examples are already:
+#
# shortcircuit USER_IN_WHITELIST on
# shortcircuit USER_IN_DEF_WHITELIST on
# shortcircuit USER_IN_ALL_SPAM_TO on
--
GitLab