From ff1248eeee80e5b32bdc86ccec4b5ce4746f8c9e Mon Sep 17 00:00:00 2001 From: Christian Glahn Date: Tue, 31 Mar 2020 17:09:23 +0200 Subject: [PATCH] activate shortcircuit plugin, fixes #1442 --- target/start-mailserver.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index e8f81e34..9b2bcfd6 100644 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -1402,12 +1402,16 @@ function _setup_security_stack() { sed -i -r 's/^\$sa_spam_subject_tag (.*);/\$sa_spam_subject_tag = '"'$SA_SPAM_SUBJECT'"';/g' /etc/amavis/conf.d/20-debian_defaults fi - # activate short circuits when SA BAYES is certain it has spam. + # activate short circuits when SA BAYES is certain it has spam or ham. if [ "$SA_SHORTCIRCUIT_BAYES_SPAM" = 1 ]; then + # automatically activate the Shortcircuit Plugin + sed -i -r 's/^# loadplugin Mail::SpamAssassin::Plugin::Shortcircuit/loadplugin Mail::SpamAssassin::Plugin::Shortcircuit/g' /etc/spamassassin/v320.pre sed -i -r 's/^# shortcircuit BAYES_99/shortcircuit BAYES_99/g' /etc/spamassassin/local.cf fi if [ "$SA_SHORTCIRCUIT_BAYES_HAM" = 1 ]; then + # automatically activate the Shortcircuit Plugin + sed -i -r 's/^# loadplugin Mail::SpamAssassin::Plugin::Shortcircuit/loadplugin Mail::SpamAssassin::Plugin::Shortcircuit/g' /etc/spamassassin/v320.pre sed -i -r 's/^# shortcircuit BAYES_00/shortcircuit BAYES_00/g' /etc/spamassassin/local.cf fi