Merge pull request #1443 from phish108/issue_1442

activate shortcircuit plugin if requested, fixes #1442
This commit is contained in:
Erik Wramner 2020-04-05 08:39:54 +02:00 committed by GitHub
commit bf3f7ed483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -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