rspamd: use score instead of forcing add header

This will make these rules work with greylisting once we enable support
for it. The score for our text-based spam filtering is kept low enough
for the combination of the replies module and authentication to bypass
the Spam mailbox but not authentication alone.

Author: thestinger

rspamd/local.d/composite.conf

@@ -0,0 +1,4 @@
+SPF_SOFTFAIL_WITHOUT_DMARC_POLICY_ALLOW {
+  expression = "R_SPF_SOFTFAIL & !DMARC_POLICY_ALLOW";
+  score = 14;
+}

rspamd/local.d/force_actions.conf

@@ -28,10 +28,4 @@ rules {
     expression = "R_SPF_PERMFAIL & !DMARC_POLICY_ALLOW";
     message = "SPF permerror";
   }
-
-  SPF_SOFTFAIL_WITHOUT_DMARC_POLICY_ALLOW {
-    action = "add header";
-    expression = "R_SPF_SOFTFAIL & !DMARC_POLICY_ALLOW";
-    require_action = ["no action", "greylist"];
-  }
 }

rspamd/local.d/multimap.conf

@@ -119,7 +119,7 @@ SPAM_SUBJECT_TEXT {
   header = "Subject";
   map = "$LOCAL_CONFDIR/local.d/maps.d/spam_text.map";
   regexp = true;
-  action = "add header";
+  score = 10.5;
 }
 
 BLOCKLIST_BODY_TEXT {
@@ -135,7 +135,7 @@ SPAM_BODY_TEXT {
   filter = "text";
   map = "$LOCAL_CONFDIR/local.d/maps.d/spam_text.map";
   regexp = true;
-  action = "add header";
+  score = 10.5;
 }
 
 BLOCKLIST_IP {