From 03acc9d2ac617eb25e20dd0d9b4832b9d26037db Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 17 Jul 2018 16:58:47 +0100
Subject: [PATCH] [Conf] Use remote maps

---
 conf/modules.d/mid.conf                 | 2 +-
 conf/modules.d/mime_types.conf          | 2 +-
 conf/modules.d/phishing.conf            | 2 +-
 conf/modules.d/surbl.conf               | 4 ++--
 conf/modules.d/whitelist.conf           | 8 ++++----
 test/functional/configs/mime_types.conf | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/modules.d/mid.conf b/conf/modules.d/mid.conf
index db1a5dafb..c6e305d7b 100644
--- 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 04117e543..b27560d6f 100644
--- 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 480b3c8d4..2ad2ce8f4 100644
--- 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 446cf616f..e0e60baa9 100644
--- 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 de8b9b516..b3f93d5f5 100644
--- 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 4aa1ac0ef..7ba2c0448 100644
--- 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 [
-- 
2.39.5