diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-12-31 17:05:36 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-12-31 17:05:36 +0000 |
| commit | bc6a0b3841495776267269d9bdaa73d162f0120b (patch) | |
| tree | 9aec0f27f54b13b4423d179eed876fb135364f6c | |
| parent | fe76a3cfd33a887cf8b85da6fd2c85e81ee0acd0 (diff) | |
| parent | 84f0c82c1c095842c4d1bf01ae2cf3ec6460f7f4 (diff) | |
| download | rspamd-bc6a0b3841495776267269d9bdaa73d162f0120b.tar.gz rspamd-bc6a0b3841495776267269d9bdaa73d162f0120b.zip | |
Merge pull request #464 from fatalbanana/surbl
Drop deprecated SURBL bits; rename JP_SURBL_MULTI to ABUSE_SURBL; add SURBL_BLOCKED
| -rw-r--r-- | conf/metrics.conf | 19 | ||||
| -rw-r--r-- | conf/modules.d/surbl.conf | 5 |
2 files changed, 9 insertions, 15 deletions
diff --git a/conf/metrics.conf b/conf/metrics.conf index 90513fb1a..e2c2b3d06 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -822,6 +822,11 @@ metric { group { name = "surbl"; symbol { + weight = 0.0; + description = "SURBL: blocked by policy/overusage"; + name = "SURBL_BLOCKED"; + } + symbol { weight = 5.5; description = "SURBL: Phishing sites"; name = "PH_SURBL_MULTI"; @@ -833,18 +838,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..5549a997a 100644 --- a/conf/modules.d/surbl.conf +++ b/conf/modules.d/surbl.conf @@ -7,12 +7,11 @@ 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; + SURBL_BLOCKED = 1; } } rule { |