diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2015-12-31 14:00:43 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2015-12-31 14:05:29 +0200 |
| commit | 9074b2eb2691d895a8703c28b2e74cebd238f7dc (patch) | |
| tree | cac7664d0994540fc0a0764fa481759da23ddc88 | |
| parent | fe76a3cfd33a887cf8b85da6fd2c85e81ee0acd0 (diff) | |
| download | rspamd-9074b2eb2691d895a8703c28b2e74cebd238f7dc.tar.gz rspamd-9074b2eb2691d895a8703c28b2e74cebd238f7dc.zip | |
Drop deprecated SURBL bits & rename JP_SURBL_MULTI to ABUSE_SURBL
| -rw-r--r-- | conf/metrics.conf | 14 | ||||
| -rw-r--r-- | conf/modules.d/surbl.conf | 4 |
2 files changed, 3 insertions, 15 deletions
diff --git a/conf/metrics.conf b/conf/metrics.conf index 90513fb1a..13abc41e6 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -833,18 +833,8 @@ metric { } symbol { weight = 5.5; - description = "SURBL: AbuseButler web sites"; - name = "AB_SURBL_MULTI"; - } - symbol { - weight = 5.5; - description = "SURBL: SpamCop web sites"; - name = "SC_SURBL_MULTI"; - } - symbol { - weight = 5.5; - description = "SURBL: jwSpamSpy + Prolocation sites"; - name = "JP_SURBL_MULTI"; + description = "SURBL: ABUSE"; + name = "ABUSE_SURBL"; } symbol { weight = 5.5; diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf index 731c7fa64..9d40ffe54 100644 --- a/conf/modules.d/surbl.conf +++ b/conf/modules.d/surbl.conf @@ -7,12 +7,10 @@ surbl { suffix = "multi.surbl.org"; symbol = "SURBL_MULTI"; bits { - JP_SURBL_MULTI = 64; - AB_SURBL_MULTI = 32; + ABUSE_SURBL = 64; MW_SURBL_MULTI = 16; PH_SURBL_MULTI = 8; WS_SURBL_MULTI = 4; - SC_SURBL_MULTI = 2; } } rule { |