From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 16 Apr 2019 11:07:42 +0000 (+0100)
Subject: Merge pull request #2850 from heraklit256/rule-descr-cleanup
X-Git-Tag: 1.9.2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e72472adf972a2dfe57c505ee892776409d042;p=thirdparty%2Frspamd.git

Merge pull request #2850 from heraklit256/rule-descr-cleanup

[Minor] unify rule scores and weights and improve descriptions
---

e6e72472adf972a2dfe57c505ee892776409d042
diff --cc conf/scores.d/rbl_group.conf
index 5912e82755,a8fdc2a423..39e77dc4a9
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@@ -61,17 -53,14 +61,17 @@@ symbols = 
      "DWL_DNSWL_NONE" {
          weight = 0.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, no trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_LOW" {
-         weight = -1;
+         weight = -1.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, low trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_MED" {
-         weight = -2;
+         weight = -2.0;
          description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, medium trust";
 +        groups = ["dnswl"];
      }
      "DWL_DNSWL_HI" {
          weight = -3.5;
diff --cc conf/scores.d/surbl_group.conf
index 22b8dba71f,76fb71f40c..9b56e71099
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@@ -142,12 -120,10 +142,12 @@@ symbols = 
      "DBL_ABUSE_BOTNET" {
          weight = 5.5;
          description = "DBL uribl abused legit botnet C&C";
 +        groups = ["spamhaus"];
      }
      "DBL_PROHIBIT" {
-         weight = 0.00000;
+         weight = 0.0;
          description = "DBL uribl IP queries prohibited!";
 +        groups = ["spamhaus"];
      }
      "URIBL_MULTI" {
          weight = 0.0;