[Conf] Allow to edit all local maps from WebUI by default

diff --git a/conf/modules.d/mime_types.conf b/conf/modules.d/mime_types.conf
index 6fd3c1da81ff2e99f7d96be6eaad3536cf356742..04117e543ec03277a055c075c6a83f90ae21895a 100644 (file)
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.conf
@@ -14,7 +14,10 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 mime_types {
-    file = "${CONFDIR}/mime_types.inc";
+    file = [
+        "${CONFDIR}/mime_types.inc",
+        "${DBDIR}/mime_types.inc.local"
+    ]
 
     # Match specific extensions to specific content types
     extension_map = {

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 3a051719bf6f3275273be43bc8f36d188a859432..2d5711b0db3c676ba941bbf74f0c46708cf52af9 100644 (file)
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -14,8 +14,14 @@
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
 surbl {
-    whitelist = "file://$CONFDIR/surbl-whitelist.inc";
-    exceptions = "file://$CONFDIR/2tld.inc";
+    whitelist = [
+        "${CONFDIR}/surbl-whitelist.inc",
+        "${DBDIR}/surbl-whitelist.inc.local"
+    ];
+    exceptions = [
+        "${CONFDIR}/2tld.inc",
+        "${DBDIR}/2tld.inc.local"
+    ];
 
     rules {
         "SURBL_MULTI" {

diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index b8637ed79d0fde3d9b9df5a0faf78e5982aed9a5..de8b9b5168100faa6599737d3ecdb6952e0410c3 100644 (file)
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -17,27 +17,39 @@ whitelist {
     rules {
         "WHITELIST_SPF" = {
             valid_spf = true;
-            domains = "${CONFDIR}/spf_whitelist.inc";
+            domains = [
+                "${CONFDIR}/spf_whitelist.inc",
+                "${DBDIR}/spf_whitelist.inc.local",
+            ];
             score = -1.0
             description = "Mail comes from the whitelisted domain and has a valid SPF policy";
         }
 
         "WHITELIST_DKIM" = {
             valid_dkim = true;
-            domains = "${CONFDIR}/dkim_whitelist.inc";
+            domains = [
+                "${CONFDIR}/dkim_whitelist.inc",
+                "${DBDIR}/dkim_whitelist.inc.local",
+            ];
             description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
             score = -1.0
         }
         "WHITELIST_SPF_DKIM" = {
             valid_spf = true;
             valid_dkim = true;
-            domains = "${CONFDIR}/spf_dkim_whitelist.inc";
+            domains = [
+                "${CONFDIR}/spf_dkim_whitelist.inc",
+                "${DBDIR}/spf_dkim_whitelist.inc.local",
+            ];
             score = -3.0;
             description = "Mail comes from the whitelisted domain and has valid SPF and DKIM policies";
         }
         "WHITELIST_DMARC" = {
             valid_dmarc = true;
-            domains = "${CONFDIR}/dmarc_whitelist.inc";
+            domains = [
+                "${CONFDIR}/dmarc_whitelist.inc",
+                "${DBDIR}/dmarc_whitelist.inc.local",
+            ];
             score = -7.0;
             description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
         }

diff --git a/conf/options.inc b/conf/options.inc
index 41a1c6ecb8553036f517406dce4dd804230f4930..b3d14654c7d7d39e30e70ea332bc1c0cfea69cf5 100644 (file)
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -14,7 +14,8 @@ dns {
     retransmits = 5;
 }
 tempdir = "/tmp";
-url_tld = "${PLUGINSDIR}/effective_tld_names.dat";
+url_tld = ["${PLUGINSDIR}/effective_tld_names.dat",
+                  "${DBDIR}/effective_tld_names.dat.local"];
 classify_headers = [
        "User-Agent",
        "X-Mailer",