diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-09-08 16:12:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 16:12:17 +0100 |
| commit | 4a6fc235b12c6e60a4fea6751d85fdb22a24ed45 (patch) | |
| tree | ca1fa4fb9153680f273ef4fa98206688293152d1 | |
| parent | 69c92e6b98e3d4555624d81ee71f1a4d0d4639d1 (diff) | |
| parent | 032de97d723dd030734b9abdb49c829be080a0b7 (diff) | |
| download | rspamd-4a6fc235b12c6e60a4fea6751d85fdb22a24ed45.tar.gz rspamd-4a6fc235b12c6e60a4fea6751d85fdb22a24ed45.zip | |
Merge pull request #935 from fatalbanana/composites
[Minor] Fine-tune composites
| -rw-r--r-- | conf/composites.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/composites.conf b/conf/composites.conf index d2e71bedf..b64201494 100644 --- a/conf/composites.conf +++ b/conf/composites.conf @@ -28,6 +28,7 @@ composite "SPF_FAIL_FORWARDING" { } composite "DMARC_POLICY_ALLOW_WITH_FAILURES" { expression = "DMARC_POLICY_ALLOW & (R_SPF_SOFTFAIL | R_SPF_FAIL | R_DKIM_REJECT)"; + policy = "remove_weight"; } composite "FORGED_RECIPIENTS_FORWARDING" { expression = "FORGED_RECIPIENTS & g:forwarding"; @@ -39,11 +40,12 @@ composite "FORGED_MUA_MAILLIST" { expression = "g:mua and -MAILLIST"; } composite "RBL_SPAMHAUS_XBL_ANY" { - expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL"; + expression = "RBL_SPAMHAUS_XBL & RECEIVED_SPAMHAUS_XBL"; } composite "AUTH_NA" { expression = "R_DKIM_NA & R_SPF_NA & DMARC_NA"; score = 1.0; + policy = "remove_weight"; } .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf" |