From 68eda4bdcab1dfba82a01ae6142a94e3580be34b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 19 Jan 2016 14:58:41 +0000 Subject: [PATCH] Fix XBL composite to avoid duplicate symbols --- conf/composites.conf | 4 ++-- conf/metrics.conf | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/conf/composites.conf b/conf/composites.conf index 0c8e0d4e87..6fc4a25bcf 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 309fa15f5a..41dca78adb 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -583,6 +583,11 @@ metric { weight = 4.0; 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; -- 2.47.3