diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-01-19 14:58:41 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-01-19 14:58:41 +0000 |
| commit | 68eda4bdcab1dfba82a01ae6142a94e3580be34b (patch) | |
| tree | 9c7ba172d6dabb56e5affba727805a4cecbf0108 | |
| parent | fce2e75b6c463e03de1af46fc268ce557c01b879 (diff) | |
| download | rspamd-68eda4bdcab1dfba82a01ae6142a94e3580be34b.tar.gz rspamd-68eda4bdcab1dfba82a01ae6142a94e3580be34b.zip | |
Fix XBL composite to avoid duplicate symbols
| -rw-r--r-- | conf/composites.conf | 4 | ||||
| -rw-r--r-- | conf/metrics.conf | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/conf/composites.conf b/conf/composites.conf index 0c8e0d4e8..6fc4a25bc 100644 --- a/conf/composites.conf +++ b/conf/composites.conf @@ -13,6 +13,6 @@ composite { expression = "g:mua and -MAILLIST"; } composite { - name = "RBL_SPAMHAUS_XBL"; - expression = "-RBL_SPAMHAUS_XBL & RECEIVED_SPAMHAUS_XBL"; + name = "RBL_SPAMHAUS_XBL_ANY"; + expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL"; } diff --git a/conf/metrics.conf b/conf/metrics.conf index 309fa15f5..41dca78ad 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -584,6 +584,11 @@ metric { description = "From address is listed in zen xbl (reserved)"; } symbol { + name = "RBL_SPAMHAUS_XBL_ANY"; + weight = 4.0; + description = "From or receive address is listed in zen xbl (any list)"; + } + symbol { name = "RBL_SPAMHAUS_PBL"; weight = 2.0; description = "From address is listed in zen pbl (ISP list)"; |