unify rules scores and weights forgotten in first commit

diff --git a/conf/modules.d/spamtrap.conf b/conf/modules.d/spamtrap.conf
index 5e2eb9a2a029f07198b49c4b02aadfdd794b4325..72165e580eb7a78c06711f1b2ed50b642d1116a8 100644 (file)
--- a/conf/modules.d/spamtrap.conf
+++ b/conf/modules.d/spamtrap.conf
@@ -37,7 +37,7 @@ spamtrap {
   # Fuzzy flag
   #fuzzy_flag = 1;
   # Fuzzy weight
-  #fuzzy_weight = 10;
+  #fuzzy_weight = 10.0;
   # Redis key prefix
   #key_prefix = 'sptr_';
   # Skip spamtrap checks for authorized users

diff --git a/conf/scores.d/headers_group.conf b/conf/scores.d/headers_group.conf
index 55251bebf8551b4298e7ae55fe0564117ec33aab..8a6ebef0964bc95ca19038d374c802d301e12765 100644 (file)
--- a/conf/scores.d/headers_group.conf
+++ b/conf/scores.d/headers_group.conf
@@ -17,7 +17,7 @@
 
 symbols = {
     "FORGED_SENDER" {
-        weight = 0.30;
+        weight = 0.3;
         description = "Sender is forged (different From: header and smtp MAIL FROM: addresses)";
     }
     "R_MIXED_CHARSET" {
@@ -62,4 +62,4 @@ symbols = {
         weight = -0.2;
         description = "Message seems to be from maillist";
     }
-}
\ No newline at end of file
+}

diff --git a/conf/scores.d/hfilter_group.conf b/conf/scores.d/hfilter_group.conf
index 89b5dd8d3877d36b05cb56053e60300eef211fc3..de446deebc5f811962485fac27a213cf59453103 100644 (file)
--- a/conf/scores.d/hfilter_group.conf
+++ b/conf/scores.d/hfilter_group.conf
@@ -17,11 +17,11 @@
 
 symbols = {
     "HFILTER_HELO_BAREIP" {
-        weight = 3.00;
+        weight = 3.0;
         description = "Helo host is bare ip";
     }
     "HFILTER_HELO_BADIP" {
-        weight = 4.50;
+        weight = 4.5;
         description = "Helo host is very bad ip";
     }
     "HFILTER_HELO_1" {
@@ -29,19 +29,19 @@ symbols = {
         description = "Helo host checks (very low)";
     }
     "HFILTER_HELO_2" {
-        weight = 1.00;
+        weight = 1.0;
         description = "Helo host checks (low)";
     }
     "HFILTER_HELO_3" {
-        weight = 2.00;
+        weight = 2.0;
         description = "Helo host checks (medium)";
     }
     "HFILTER_HELO_4" {
-        weight = 2.50;
+        weight = 2.5;
         description = "Helo host checks (hard)";
     }
     "HFILTER_HELO_5" {
-        weight = 3.00;
+        weight = 3.0;
         description = "Helo host checks (very hard)";
     }
     "HFILTER_HOSTNAME_1" {
@@ -49,23 +49,23 @@ symbols = {
         description = "Hostname checks (very low)";
     }
     "HFILTER_HOSTNAME_2" {
-        weight = 1.00;
+        weight = 1.0;
         description = "Hostname checks (low)";
     }
     "HFILTER_HOSTNAME_3" {
-        weight = 2.00;
+        weight = 2.0;
         description = "Hostname checks (medium)";
     }
     "HFILTER_HOSTNAME_4" {
-        weight = 2.50;
+        weight = 2.5;
         description = "Hostname checks (hard)";
     }
     "HFILTER_HOSTNAME_5" {
-        weight = 3.00;
+        weight = 3.0;
         description = "Hostname checks (very hard)";
     }
     "HFILTER_HELO_NORESOLVE_MX" {
-        weight = 0.20;
+        weight = 0.2;
         description = "MX found in Helo and no resolve";
     }
     "HFILTER_HELO_NORES_A_OR_MX" {
@@ -73,11 +73,11 @@ symbols = {
         description = "Helo no resolve to A or MX";
     }
     "HFILTER_HELO_IP_A" {
-        weight = 1.00;
+        weight = 1.0;
         description = "Helo A IP != hostname IP";
     }
     "HFILTER_HELO_NOT_FQDN" {
-        weight = 2.00;
+        weight = 2.0;
         description = "Helo not FQDN";
     }
     "HFILTER_FROMHOST_NORESOLVE_MX" {
@@ -85,47 +85,47 @@ symbols = {
         description = "MX found in FROM host and no resolve";
     }
     "HFILTER_FROMHOST_NORES_A_OR_MX" {
-        weight = 1.50;
+        weight = 1.5;
         description = "FROM host no resolve to A or MX";
     }
     "HFILTER_FROMHOST_NOT_FQDN" {
-        weight = 3.00;
+        weight = 3.0;
         description = "FROM host not FQDN";
     }
     "HFILTER_FROM_BOUNCE" {
-        weight = 0.00;
+        weight = 0.0;
         description = "Bounce message";
     }
 /*
     # Disabled by default
     "HFILTER_MID_NORESOLVE_MX" {
-        weight = 0.50;
+        weight = 0.5;
         description = "MX found in Message-id host and no resolve";
     }
     "HFILTER_MID_NORES_A_OR_MX" {
-        weight = 0.50;
+        weight = 0.5;
         name = ;
         description = "Message-id host no resolve to A or MX";
     }
     "HFILTER_MID_NOT_FQDN" {
-        weight = 0.50;
+        weight = 0.5;
         description = "Message-id host not FQDN";
     }
 */
     "HFILTER_HOSTNAME_UNKNOWN" {
-        weight = 2.50;
+        weight = 2.5;
         description = "Unknown client hostname (PTR or FCrDNS verification failed)";
     }
     "HFILTER_RCPT_BOUNCEMOREONE" {
-        weight = 1.50;
+        weight = 1.5;
         description = "Message from bounce and over 1 recipient";
     }
     "HFILTER_URL_ONLY" {
-        weight = 2.20;
+        weight = 2.2;
         description = "URL only in body";
     }
     "HFILTER_URL_ONELINE" {
-        weight = 2.50;
+        weight = 2.5;
         description = "One line URL and text in body";
     }
 }

diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index 3d19f1698e8d81ad595af313d30f911b0f926bdc..a8fdc2a423bf7f75cfc1444c04882af1131ad3b9 100644 (file)
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -55,11 +55,11 @@ symbols = {
         description = "Message has a valid dkim signature originated from domain listed at https://www.dnswl.org, no trust";
     }
     "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";
     }
     "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";
     }
     "DWL_DNSWL_HI" {

diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 9605df5c05024f199ce234c56d38f6b34af50b4b..76fb71f40c71ea158dab84f5d6f0e9232af517a3 100644 (file)
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -122,7 +122,7 @@ symbols = {
         description = "DBL uribl abused legit botnet C&C";
     }
     "DBL_PROHIBIT" {
-        weight = 0.00000;
+        weight = 0.0;
         description = "DBL uribl IP queries prohibited!";
     }
     "URIBL_MULTI" {