[Conf] Use remote maps

diff --git a/conf/modules.d/mid.conf b/conf/modules.d/mid.conf
index db1a5dafb448fbae9d48bcc61843d4b885e0706e..c6e305d7b81d7da3a1aa77e8a6db750f2b19e856 100644 (file)
--- a/conf/modules.d/mid.conf
+++ b/conf/modules.d/mid.conf
@@ -16,7 +16,7 @@
 mid = {
     source = {
         url = [
-            "${CONFDIR}/mid.inc",
+            "https://maps.rspamd.com/rspamd/mid.inc.zst",
             "$LOCAL_CONFDIR/local.d/mid.inc"
         ];
     }

diff --git a/conf/modules.d/mime_types.conf b/conf/modules.d/mime_types.conf
index 04117e543ec03277a055c075c6a83f90ae21895a..b27560d6f252c34567ef52d1d7e1c4d0e62dd7e9 100644 (file)
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.conf
@@ -15,7 +15,7 @@
 
 mime_types {
     file = [
-        "${CONFDIR}/mime_types.inc",
+        "https://maps.rspamd.com/rspamd/mime_types.inc.zst",
         "${DBDIR}/mime_types.inc.local"
     ]
 

diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index 480b3c8d4db20dee601e3a5ed8cfc87f18df8d13..2ad2ce8f40e7f2a35a1544b12af72553f4c29079 100644 (file)
--- a/conf/modules.d/phishing.conf
+++ b/conf/modules.d/phishing.conf
@@ -25,7 +25,7 @@ phishing {
 
     # Make exclusions for known redirectors
     redirector_domains = [
-        "${CONFDIR}/redirectors.inc:REDIRECTOR_FALSE",
+        "https://maps.rspamd.com/rspamd/redirectors.inc.zst:REDIRECTOR_FALSE",
         "$LOCAL_CONFDIR/local.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE"
     ];
 

diff --git a/conf/modules.d/surbl.conf b/conf/modules.d/surbl.conf
index 446cf616faef0f74faa79101a030afd4f9876136..e0e60baa9a7f3ccefae816a19bae0796ed35a836 100644 (file)
--- a/conf/modules.d/surbl.conf
+++ b/conf/modules.d/surbl.conf
@@ -15,11 +15,11 @@
 
 surbl {
     whitelist = [
-        "${CONFDIR}/surbl-whitelist.inc",
+        "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst",
         "${DBDIR}/surbl-whitelist.inc.local"
     ];
     exceptions = [
-        "${CONFDIR}/2tld.inc",
+        "https://maps.rspamd.com/rspamd/2tld.inc.zst",
         "${DBDIR}/2tld.inc.local"
     ];
 

diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index de8b9b5168100faa6599737d3ecdb6952e0410c3..b3f93d5f5d53c752529bb0c6abd832826eadccea 100644 (file)
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -18,7 +18,7 @@ whitelist {
         "WHITELIST_SPF" = {
             valid_spf = true;
             domains = [
-                "${CONFDIR}/spf_whitelist.inc",
+                "https://maps.rspamd.com/rspamd/spf_whitelist.inc.zst",
                 "${DBDIR}/spf_whitelist.inc.local",
             ];
             score = -1.0
@@ -28,7 +28,7 @@ whitelist {
         "WHITELIST_DKIM" = {
             valid_dkim = true;
             domains = [
-                "${CONFDIR}/dkim_whitelist.inc",
+                "https://maps.rspamd.com/rspamd/dkim_whitelist.inc.zst",
                 "${DBDIR}/dkim_whitelist.inc.local",
             ];
             description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
@@ -38,7 +38,7 @@ whitelist {
             valid_spf = true;
             valid_dkim = true;
             domains = [
-                "${CONFDIR}/spf_dkim_whitelist.inc",
+                "https://maps.rspamd.com/rspamd/spf_dkim_whitelist.inc.zst",
                 "${DBDIR}/spf_dkim_whitelist.inc.local",
             ];
             score = -3.0;
@@ -47,7 +47,7 @@ whitelist {
         "WHITELIST_DMARC" = {
             valid_dmarc = true;
             domains = [
-                "${CONFDIR}/dmarc_whitelist.inc",
+                "https://maps.rspamd.com/rspamd/dmarc_whitelist.inc.zst",
                 "${DBDIR}/dmarc_whitelist.inc.local",
             ];
             score = -7.0;

diff --git a/test/functional/configs/mime_types.conf b/test/functional/configs/mime_types.conf
index 4aa1ac0efca082798fbb9512a9cf6802a81e32ee..7ba2c044811416cd007a56a18bca212d43ee5d8c 100644 (file)
--- a/test/functional/configs/mime_types.conf
+++ b/test/functional/configs/mime_types.conf
@@ -1,5 +1,5 @@
 mime_types {
-    file = "${TESTDIR}/../../../conf/mime_types.inc";
+    file = "https://maps.rspamd.com/rspamd/mime_types.inc.zst";
     extension_map {
         html = "text/html";
         txt [