Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

data/conf/rspamd/local.d/composites.conf

@@ -4,12 +4,12 @@ MX_IMPLICIT {
 }
 VIRUS_FOUND {
   expression = "CLAM_VIRUS & !MAILCOW_WHITE";
-  score = 2000;
+  score = 2000.0;
 }
 # Bad policy from non-whitelisted senders
 POLICY_FAILURE {
   expression = "-g+:policies & !MAILCOW_WHITE";
-  score = 10;
+  score = 1.0;
 }
 # Remove SOGO_CONTACT symbol for fwd hosts and senders with broken policy
 SOGO_CONTACT_EXCLUDE {

data/conf/rspamd/local.d/policies_group.conf

@@ -1,23 +1,23 @@
 symbols = {
     "ARC_REJECT" {
-        score = 0.0;
+        score = 0.01;
     }
     "R_SPF_FAIL" {
-        score = 10.0;
+        score = 8.0;
     }
     "R_SPF_PERMFAIL" {
-        score = 10.0;
+        score = 8.0;
     }
     "R_DKIM_REJECT" {
-        score = 10.0;
+        score = 8.0;
     }
     "DMARC_POLICY_REJECT" {
-        weight = 20.0;
+        weight = 16.0;
     }
     "DMARC_POLICY_QUARANTINE" {
-        weight = 10.0;
+        weight = 8.0;
     }
     "DMARC_POLICY_SOFTFAIL" {
-        weight = 2.0;
+        weight = 1.0;
     }
 }