[Fix] Really fix local.d includes

18 files changed, 60 insertions, 48 deletions

diff --git a/conf/modules.d/chartable.conf b/conf/modules.d/chartable.conf
index 24f4811d0..ad08eaf48 100644
--- a/conf/modules.d/chartable.conf
+++ b/conf/modules.d/chartable.conf
@@ -14,9 +14,9 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 chartable {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/chartable.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/chartable.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/chartable.conf"
     threshold = 0.300000;
     symbol = "R_MIXED_CHARSET";
+    .include(try=true,priority=5) "${DBDIR}/dynamic/chartable.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/chartable.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/chartable.conf"
 }
diff --git a/conf/modules.d/dkim.conf b/conf/modules.d/dkim.conf
index 7a2795d59..2cb0e903e 100644
--- a/conf/modules.d/dkim.conf
+++ b/conf/modules.d/dkim.conf
@@ -14,12 +14,13 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 dkim {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/dkim.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/dkim.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dkim.conf"
     dkim_cache_size = 2k;
     dkim_cache_expire = 1d;
     time_jitter = 6h;
     trusted_only = false;
     skip_multi = false;
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/dkim.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/dkim.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/dkim.conf"
 }
diff --git a/conf/modules.d/emails.conf b/conf/modules.d/emails.conf
index 8f6a163e5..315643241 100644
--- a/conf/modules.d/emails.conf
+++ b/conf/modules.d/emails.conf
@@ -15,6 +15,6 @@
 
 emails {
     .include(try=true,priority=5) "${DBDIR}/dynamic/emails.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/emails.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/emails.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/emails.conf"
 }
diff --git a/conf/modules.d/forged_recipients.conf b/conf/modules.d/forged_recipients.conf
index 7ecdbce52..fe17d1e4d 100644
--- a/conf/modules.d/forged_recipients.conf
+++ b/conf/modules.d/forged_recipients.conf
@@ -14,9 +14,10 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 forged_recipients {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/forged_recipients.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/forged_recipients.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/forged_recipients.conf"
     symbol_sender = "FORGED_SENDER";
     symbol_rcpt = "FORGED_RECIPIENTS";
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/forged_recipients.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/forged_recipients.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/forged_recipients.conf"
 }
diff --git a/conf/modules.d/hfilter.conf b/conf/modules.d/hfilter.conf
index 7da35403e..054a46295 100644
--- a/conf/modules.d/hfilter.conf
+++ b/conf/modules.d/hfilter.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 hfilter {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/hfilter.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/hfilter.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/hfilter.conf"
     helo_enabled = true;
     hostname_enabled = true;
     url_enabled = true;
@@ -24,4 +21,8 @@ hfilter {
     rcpt_enabled = true;
     mid_enabled = false;
     rcpt_enabled = true;
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/hfilter.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/hfilter.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/hfilter.conf"
 }
diff --git a/conf/modules.d/ip_score.conf b/conf/modules.d/ip_score.conf
index f8599fc06..67deda38a 100644
--- a/conf/modules.d/ip_score.conf
+++ b/conf/modules.d/ip_score.conf
@@ -14,13 +14,13 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 ip_score {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/ip_score.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/ip_score.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ip_score.conf"
 #    servers = "localhost";
 #    treshold = 100;
 #    reject_score = 3;
 #    no_action_score = -2;
 #    add_header_score = 1;
 #    whitelist = "file:///ip_map";
+    .include(try=true,priority=5) "${DBDIR}/dynamic/ip_score.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/ip_score.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ip_score.conf"
 }
diff --git a/conf/modules.d/maillist.conf b/conf/modules.d/maillist.conf
index 26e0ca7ad..d06a3cdfb 100644
--- a/conf/modules.d/maillist.conf
+++ b/conf/modules.d/maillist.conf
@@ -14,8 +14,8 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 maillist {
+    symbol = "MAILLIST";
     .include(try=true,priority=5) "${DBDIR}/dynamic/maillist.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/maillist.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/maillist.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/maillist.conf"
-    symbol = "MAILLIST";
 }
diff --git a/conf/modules.d/mime_types.conf b/conf/modules.d/mime_types.conf
index e4c80e0a1..6fd3c1da8 100644
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 mime_types {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/mime_types.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/mime_types.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/mime_types.conf"
     file = "${CONFDIR}/mime_types.inc";
 
     # Match specific extensions to specific content types
@@ -32,4 +29,8 @@ mime_types {
         "application/pdf"
       ];
     }
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/mime_types.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/mime_types.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/mime_types.conf"
 }
diff --git a/conf/modules.d/multimap.conf b/conf/modules.d/multimap.conf
index 72f567177..347bdf185 100644
--- a/conf/modules.d/multimap.conf
+++ b/conf/modules.d/multimap.conf
@@ -15,7 +15,7 @@
 
 multimap {
     .include(try=true,priority=5) "${DBDIR}/dynamic/multimap.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/multimap.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/multimap.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/multimap.conf"
 }
 
diff --git a/conf/modules.d/once_received.conf b/conf/modules.d/once_received.conf
index 65efa20a7..93080d531 100644
--- a/conf/modules.d/once_received.conf
+++ b/conf/modules.d/once_received.conf
@@ -14,12 +14,13 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 once_received {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/once_received.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/once_received.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/once_received.conf"
     good_host = "mail";
     bad_host = "static";
     bad_host = "dynamic";
     symbol_strict = "ONCE_RECEIVED_STRICT";
     symbol = "ONCE_RECEIVED";
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/once_received.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/once_received.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/once_received.conf"
 }
diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index 8875a3898..8bf428e76 100644
--- a/conf/modules.d/phishing.conf
+++ b/conf/modules.d/phishing.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 phishing {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/phishing.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/phishing.conf"
     symbol = "PHISHING";
     # Disabled by default
     openphish_enabled = false;
@@ -32,4 +29,7 @@ phishing {
         "$LOCAL_CONFDIR/local.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE"
     ];
 
+    .include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/phishing.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/phishing.conf"
 }
diff --git a/conf/modules.d/ratelimit.conf b/conf/modules.d/ratelimit.conf
index 97833c6f5..863dc9a3d 100644
--- a/conf/modules.d/ratelimit.conf
+++ b/conf/modules.d/ratelimit.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 ratelimit {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/ratelimit.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/ratelimit.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ratelimit.conf"
     rates {
         # Limit for all mail per recipient (burst 100, rate 2 per minute)
         to = [100, 0.033333333];
@@ -35,4 +32,8 @@ ratelimit {
     #symbol = "R_RATELIMIT";
     whitelisted_rcpts = "postmaster,mailer-daemon";
     max_rcpt = 5;
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/ratelimit.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/ratelimit.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/ratelimit.conf"
 }
diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 6b103230b..20f3ca41b 100644
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 rbl {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/rbl.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rbl.conf"
     default_from = true;
     default_received = false;
     default_exclude_users = true;
@@ -168,4 +165,8 @@ rbl {
         }
 
     }
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/rbl.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rbl.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rbl.conf"
 }
diff --git a/conf/modules.d/regexp.conf b/conf/modules.d/regexp.conf
index 56c4fe46c..f76527871 100644
--- a/conf/modules.d/regexp.conf
+++ b/conf/modules.d/regexp.conf
@@ -14,8 +14,9 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 regexp {
+    max_size = 1M;
+
     .include(try=true,priority=5) "${DBDIR}/dynamic/regexp.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/regexp.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/regexp.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/regexp.conf"
-    max_size = 1M;
 }
diff --git a/conf/modules.d/rspamd_update.conf b/conf/modules.d/rspamd_update.conf
index be34888a2..64b3114f6 100644
--- a/conf/modules.d/rspamd_update.conf
+++ b/conf/modules.d/rspamd_update.conf
@@ -14,9 +14,10 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 rspamd_update {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/rspamd_update.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/rspamd_update.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rspamd_update.conf"
     rules = "sign+http://rspamd.com/update/rspamd-${BRANCH_VERSION}.ucl";
     key = "qxuogdh5eghytji1utkkte1dn3n81c3y5twe61uzoddzwqzuxxyb";
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/rspamd_update.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/rspamd_update.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/rspamd_update.conf"
 }
diff --git a/conf/modules.d/spf.conf b/conf/modules.d/spf.conf
index e25158d34..fa66147a8 100644
--- a/conf/modules.d/spf.conf
+++ b/conf/modules.d/spf.conf
@@ -14,9 +14,10 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 spf {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/spf.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/spf.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spf.conf"
     spf_cache_size = 2k;
     spf_cache_expire = 1d;
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/spf.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/spf.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/spf.conf"
 }
diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 2adc1cc27..68038ea64 100644
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 surbl {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/surbl.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/surbl.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/surbl.conf"
     whitelist = "file://$CONFDIR/surbl-whitelist.inc";
     exceptions = "file://$CONFDIR/2tld.inc";
 
@@ -98,4 +95,8 @@ surbl {
         }
         no_ip = true;
     }
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/surbl.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/surbl.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/surbl.conf"
 }
diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index f1d1ab56a..b8637ed79 100644
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -14,9 +14,6 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 whitelist {
-    .include(try=true,priority=5) "${DBDIR}/dynamic/whitelist.conf"
-    .include(try=true,priority=1) "$LOCAL_CONFDIR/local.d/whitelist.conf"
-    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/whitelist.conf"
     rules {
         "WHITELIST_SPF" = {
             valid_spf = true;
@@ -45,4 +42,8 @@ whitelist {
             description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
         }
     }
+
+    .include(try=true,priority=5) "${DBDIR}/dynamic/whitelist.conf"
+    .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/whitelist.conf"
+    .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/whitelist.conf"
 }