20 files changed, 81 insertions, 59 deletions
diff --git a/conf/common.conf b/conf/common.conf
index 023fd5125..7b3609fbb 100644
--- a/conf/common.conf
+++ b/conf/common.conf
@@ -8,11 +8,7 @@
 # You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add
 # parameters defined on the top level
 #
-# For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
-#
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 lua = "$RULESDIR/rspamd.lua"
 
diff --git a/conf/composites.conf b/conf/composites.conf
index 34a6c170e..635022222 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -11,7 +11,7 @@
 # See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
 # for details
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html and
+# See https://rspamd.com/doc/developers/writing_rules.html and
 # https://rspamd.com/doc/configuration/composites.html for details
 
 composites {
@@ -171,6 +171,12 @@ composites {
     description = "Message exhibits strong characteristics of advance fee fraud (AFF a/k/a '419' spam) involving freemail addresses";
     group = "scams";
   }
+  FREEMAIL_REPLYTO_NEQ_FROM {
+    expression = "FREEMAIL_REPLYTO & !REPLYTO_EQ_FROM & !REPLYTO_ADDR_EQ_FROM & !FREEMAIL_REPLYTO_NEQ_FROM_DOM";
+    score = 2.0;
+    policy = "leave";
+    description = "Reply-To is a Freemail address and it not match From header or SMTP From, also From is not another Freemail";
+  }
   SUSPICIOUS_MDN {
     expression = "(FREEMAIL_MDN | DISPOSABLE_MDN) & !(FREEMAIL_FROM | FREEMAIL_ENVFROM)";
     score = 2.0;
diff --git a/conf/maps.d/spf_dkim_whitelist.inc b/conf/maps.d/spf_dkim_whitelist.inc
index fe0ddbbaa..09ceba89b 100644
--- a/conf/maps.d/spf_dkim_whitelist.inc
+++ b/conf/maps.d/spf_dkim_whitelist.inc
@@ -33,7 +33,6 @@ asana.com
 att.com
 autohome.com.cn
 avg.com
-aweber.com
 badoo.com
 bankofamerica.com
 basecamp.com
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 9c4358f30..daf1139f1 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -9,10 +9,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/metrics.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/metrics.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 # DEPRECATION WARNING!!
 # This file is deprecated since 1.7
diff --git a/conf/modules.conf b/conf/modules.conf
index 51f1f420e..42fc0419e 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -9,10 +9,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/modules.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/modules.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 .include(glob=true) "${CONFDIR}/modules.d/*.conf"
-.include(try=true, glob=true) "${CONFDIR}/modules.local.d/*.conf"
-\ No newline at end of file
+.include(try=true, glob=true) "${CONFDIR}/modules.local.d/*.conf"
diff --git a/conf/modules.d/contextal.conf b/conf/modules.d/contextal.conf
new file mode 100644
index 000000000..da61b2cd8
--- /dev/null
+++ b/conf/modules.d/contextal.conf
@@ -0,0 +1,21 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+# You can modify 'local.d/contextal.conf' to add and merge
+# parameters defined inside this section
+#
+# You can modify 'override.d/contextal.conf' to strictly override all
+# parameters defined inside this section
+#
+# See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories
+# for details
+#
+# Module documentation can be found at  https://rspamd.com/doc/modules/contextal.html
+
+contextal {
+  enabled = false;
+
+  .include(try=true,priority=5) "${DBDIR}/dynamic/contextal.conf"
+  .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/contextal.conf"
+  .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/contextal.conf"
+}
diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index b05a18b72..6f07e7eec 100644
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/rspamd.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/rspamd.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 .include "$CONFDIR/common.conf"
 
diff --git a/conf/scores.d/content_group.conf b/conf/scores.d/content_group.conf
index 88b476501..9bb87932c 100644
--- a/conf/scores.d/content_group.conf
+++ b/conf/scores.d/content_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/content_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/content_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Content rules";
 
diff --git a/conf/scores.d/fuzzy_group.conf b/conf/scores.d/fuzzy_group.conf
index bc2f9498a..0bab0ca0a 100644
--- a/conf/scores.d/fuzzy_group.conf
+++ b/conf/scores.d/fuzzy_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/fuzzy_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/fuzzy_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Fuzzy hashes group";
 
@@ -34,4 +34,4 @@ symbols = {
         weight = -2.1;
         description = "Whitelisted fuzzy hash, bl.rspamd.com";
     }
-}
-\ No newline at end of file
+}
diff --git a/conf/scores.d/headers_group.conf b/conf/scores.d/headers_group.conf
index 972c6872a..2c2ebd9d4 100644
--- a/conf/scores.d/headers_group.conf
+++ b/conf/scores.d/headers_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/headers_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/headers_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Various headers checks";
 
diff --git a/conf/scores.d/hfilter_group.conf b/conf/scores.d/hfilter_group.conf
index 21cd11a60..646c1cd2a 100644
--- a/conf/scores.d/hfilter_group.conf
+++ b/conf/scores.d/hfilter_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/hfilter_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/hfilter_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "SMTP envelope filter";
 
diff --git a/conf/scores.d/mime_types_group.conf b/conf/scores.d/mime_types_group.conf
index 13778fe91..7df1c9ba1 100644
--- a/conf/scores.d/mime_types_group.conf
+++ b/conf/scores.d/mime_types_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/mime_types_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/mime_types_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Mime attachments rules";
 
diff --git a/conf/scores.d/mua_group.conf b/conf/scores.d/mua_group.conf
index 18ca0131e..4eb50e965 100644
--- a/conf/scores.d/mua_group.conf
+++ b/conf/scores.d/mua_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/mua_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/mua_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "MUA forgeries";
 
@@ -22,4 +22,4 @@ symbols = {
         weight = 0.0;
         description = "Avoid false positives for FORGED_MUA_* in maillist";
     }
-}
-\ No newline at end of file
+}
diff --git a/conf/scores.d/phishing_group.conf b/conf/scores.d/phishing_group.conf
index ef124bd8f..d929f8fbe 100644
--- a/conf/scores.d/phishing_group.conf
+++ b/conf/scores.d/phishing_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/phishing_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/phishing_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Phishing in emails";
 
diff --git a/conf/scores.d/policies_group.conf b/conf/scores.d/policies_group.conf
index 712c61523..865aa783c 100644
--- a/conf/scores.d/policies_group.conf
+++ b/conf/scores.d/policies_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/policies_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/policies_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "SPF, DKIM, DMARC, ARC";
 
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index 448f62030..795ea9efd 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/rbl_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/rbl_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "IP DNS lists";
 
diff --git a/conf/scores.d/statistics_group.conf b/conf/scores.d/statistics_group.conf
index b46fa7adc..1556b867c 100644
--- a/conf/scores.d/statistics_group.conf
+++ b/conf/scores.d/statistics_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/statistics_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/statistics_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Statistical symbols";
 
@@ -26,4 +26,4 @@ symbols = {
         weight = -3.0;
         description = "Message probably ham, probability: ";
     }
-}
-\ No newline at end of file
+}
diff --git a/conf/scores.d/subject_group.conf b/conf/scores.d/subject_group.conf
index 1cc2e0c4d..8c9b70033 100644
--- a/conf/scores.d/subject_group.conf
+++ b/conf/scores.d/subject_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/subject_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/subject_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "Subject filters";
 
diff --git a/conf/scores.d/surbl_group.conf b/conf/scores.d/surbl_group.conf
index 255c03214..d0cb97009 100644
--- a/conf/scores.d/surbl_group.conf
+++ b/conf/scores.d/surbl_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/surbl_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/surbl_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "URL DNS lists";
 
diff --git a/conf/scores.d/whitelist_group.conf b/conf/scores.d/whitelist_group.conf
index c0d20442d..b80a1f884 100644
--- a/conf/scores.d/whitelist_group.conf
+++ b/conf/scores.d/whitelist_group.conf
@@ -10,10 +10,10 @@
 # parameters defined on the top level
 #
 # For specific modules or configuration you can also modify
-# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults
-# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults
+# '$LOCAL_CONFDIR/local.d/whitelist_group.conf' - to add your options or rewrite defaults
+# '$LOCAL_CONFDIR/override.d/whitelist_group.conf' - to override the defaults
 #
-# See https://rspamd.com/doc/tutorials/writing_rules.html for details
+# See https://rspamd.com/doc/developers/writing_rules.html for details
 
 description = "White lists group";