diff options
| author | root <root@jones.dk> | 2016-10-25 13:20:28 +0200 |
|---|---|---|
| committer | root <root@jones.dk> | 2016-10-25 13:20:28 +0200 |
| commit | af852a1b3615b51032ef8cc08175421a258ce296 (patch) | |
| tree | 8b58a235630e2bca690e4ca062e05e27e322bb39 /dovecot | |
| parent | e7e80aeb159ad019ff1829692c3ecf154196cf8c (diff) | |
Fix X-Spam-Status: regular expressions.
Diffstat (limited to 'dovecot')
| -rw-r--r-- | dovecot/conf.d/90-sieve.conf | 7 | ||||
| -rw-r--r-- | dovecot/conf.d/90-sieve.conf.diff | 13 |
2 files changed, 11 insertions, 9 deletions
diff --git a/dovecot/conf.d/90-sieve.conf b/dovecot/conf.d/90-sieve.conf index 8c2144b..d543a29 100644 --- a/dovecot/conf.d/90-sieve.conf +++ b/dovecot/conf.d/90-sieve.conf @@ -74,7 +74,8 @@ plugin { #sieve_after = #sieve_after2 = #sieve_after2 = (etc...) - sieve_after = /etc/dovecot/sieve-after/ +# sieve_after = /etc/dovecot/sieve-after/ + sieve_after = /etc/dovecot/sieve-after/spam-to-folder.sieve # Which Sieve language extensions are available to users. By default, all # supported extensions are available, except for deprecated extensions or @@ -88,8 +89,8 @@ plugin { sieve_extensions = +spamtest +spamtestplus sieve_spamtest_status_type = score - sieve_spamtest_status_header = X-Spam-Score:.* score=(-?[[:digit:]]+\.[[:digit:]]).* - sieve_spamtest_max_header = X-Spam-Score:.* score=-?[[:digit:]]+\.[[:digit:]] 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 f2fd803..7f28e22 100644 --- a/dovecot/conf.d/90-sieve.conf.diff +++ b/dovecot/conf.d/90-sieve.conf.diff @@ -1,22 +1,23 @@ --- 90-sieve.conf.orig 2016-08-25 15:52:02.000000000 +0200 -+++ 90-sieve.conf 2016-10-24 22:28:41.000000000 +0200 -@@ -74,6 +74,7 @@ ++++ 90-sieve.conf 2016-10-25 13:18:50.000000000 +0200 +@@ -74,6 +74,8 @@ #sieve_after = #sieve_after2 = #sieve_after2 = (etc...) -+ sieve_after = /etc/dovecot/sieve-after/ ++# sieve_after = /etc/dovecot/sieve-after/ ++ sieve_after = /etc/dovecot/sieve-after/spam-to-folder.sieve # Which Sieve language extensions are available to users. By default, all # supported extensions are available, except for deprecated extensions or -@@ -84,6 +85,11 @@ +@@ -84,6 +86,11 @@ # deprecated imapflags extension in addition to all extensions were already # enabled by default. #sieve_extensions = +notify +imapflags + sieve_extensions = +spamtest +spamtestplus + + sieve_spamtest_status_type = score -+ sieve_spamtest_status_header = X-Spam-Score:.* score=(-?[[:digit:]]+\.[[:digit:]]).* -+ sieve_spamtest_max_header = X-Spam-Score:.* score=-?[[:digit:]]+\.[[:digit:]] 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 |