From 00f64c60459a2b05371ab0c949172314b7a48dba Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Oct 2016 17:19:15 +0200 Subject: Tune spamfilter header regex slightly (properly this time). --- dovecot/conf.d/90-sieve.conf | 4 ++-- dovecot/conf.d/90-sieve.conf.diff | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dovecot') diff --git a/dovecot/conf.d/90-sieve.conf b/dovecot/conf.d/90-sieve.conf index 5f16088..12d71d3 100644 --- a/dovecot/conf.d/90-sieve.conf +++ b/dovecot/conf.d/90-sieve.conf @@ -88,8 +88,8 @@ plugin { sieve_extensions = +spamtest +spamtestplus sieve_spamtest_status_type = score - sieve_spamtest_status_header = X-Spam-Status:.* score=(-?[[:digit:]]+\.[[:digit:]]+) .* - sieve_spamtest_max_header = X-Spam-Status:.* required=([[:digit:]]+\.[[:digit:]]+) .* + sieve_spamtest_status_header = X-Spam-Status:.* score=(-?[[:digit:]]+\.?[[:digit:]]*).* + sieve_spamtest_max_header = X-Spam-Status:.* required=([[:digit:]]+\.?[[:digit:]]*).* # Which Sieve language extensions are ONLY available in global scripts. This # can be used to restrict the use of certain Sieve extensions to administrator diff --git a/dovecot/conf.d/90-sieve.conf.diff b/dovecot/conf.d/90-sieve.conf.diff index 8661d40..2b1ea47 100644 --- a/dovecot/conf.d/90-sieve.conf.diff +++ b/dovecot/conf.d/90-sieve.conf.diff @@ -1,5 +1,5 @@ --- 90-sieve.conf.orig 2016-08-25 15:52:02.000000000 +0200 -+++ 90-sieve.conf 2016-10-26 13:17:50.000000000 +0200 ++++ 90-sieve.conf 2016-10-26 17:05:54.000000000 +0200 @@ -74,6 +74,7 @@ #sieve_after = #sieve_after2 = @@ -15,8 +15,8 @@ + sieve_extensions = +spamtest +spamtestplus + + sieve_spamtest_status_type = score -+ sieve_spamtest_status_header = X-Spam-Status:.* score=(-?[[:digit:]]+\.[[:digit:]]+).* -+ sieve_spamtest_max_header = X-Spam-Status:.* required=([[:digit:]]+\.[[:digit:]]+).* ++ sieve_spamtest_status_header = X-Spam-Status:.* score=(-?[[:digit:]]+\.?[[:digit:]]*).* ++ sieve_spamtest_max_header = X-Spam-Status:.* required=([[:digit:]]+\.?[[:digit:]]*).* # Which Sieve language extensions are ONLY available in global scripts. This # can be used to restrict the use of certain Sieve extensions to administrator -- cgit v1.2.3