[Conf] Introduce maps.d directories

diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index 1af0c5fb45733809eced5baafedac61c1ca23876..c5f0ee4e1ff941a154a75edae9ec6f3cc295c9a6 100644 (file)
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -195,13 +195,13 @@ fi
 %config(noreplace) %{rspamd_confdir}/%{name}.conf
 %config(noreplace) %{rspamd_confdir}/composites.conf
 %config(noreplace) %{rspamd_confdir}/metrics.conf
-%config(noreplace) %{rspamd_confdir}/mime_types.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/mime_types.inc
 %config(noreplace) %{rspamd_confdir}/modules.conf
 %config(noreplace) %{rspamd_confdir}/statistic.conf
 %config(noreplace) %{rspamd_confdir}/common.conf
 %config(noreplace) %{rspamd_confdir}/logging.inc
 %config(noreplace) %{rspamd_confdir}/options.inc
-%config(noreplace) %{rspamd_confdir}/redirectors.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/redirectors.inc
 %config(noreplace) %{rspamd_confdir}/worker-controller.inc
 %config(noreplace) %{rspamd_confdir}/worker-fuzzy.inc
 %config(noreplace) %{rspamd_confdir}/worker-normal.inc
@@ -217,9 +217,9 @@ fi
 %dir %{rspamd_pluginsdir}
 %dir %{rspamd_wwwdir}
 %dir %{_libdir}/rspamd
-%config(noreplace) %{rspamd_confdir}/surbl-whitelist.inc
-%config(noreplace) %{rspamd_confdir}/spf_dkim_whitelist.inc
-%config(noreplace) %{rspamd_confdir}/dmarc_whitelist.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/surbl-whitelist.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/spf_dkim_whitelist.inc
+%config(noreplace) %{rspamd_confdir}/maps.d/dmarc_whitelist.inc
 %{rspamd_pluginsdir}/lib/*.lua
 %{rspamd_pluginsdir}/lua/*.lua
 %{rspamd_rulesdir}/regexp/*.lua

diff --git a/conf/dmarc_whitelist.inc b/conf/maps.d/dmarc_whitelist.inc
similarity index 100%
rename from conf/dmarc_whitelist.inc
rename to conf/maps.d/dmarc_whitelist.inc

diff --git a/conf/maillist.inc b/conf/maps.d/maillist.inc
similarity index 100%
rename from conf/maillist.inc
rename to conf/maps.d/maillist.inc

diff --git a/conf/mid.inc b/conf/maps.d/mid.inc
similarity index 100%
rename from conf/mid.inc
rename to conf/maps.d/mid.inc

diff --git a/conf/mime_types.inc b/conf/maps.d/mime_types.inc
similarity index 100%
rename from conf/mime_types.inc
rename to conf/maps.d/mime_types.inc

diff --git a/conf/redirectors.inc b/conf/maps.d/redirectors.inc
similarity index 100%
rename from conf/redirectors.inc
rename to conf/maps.d/redirectors.inc

diff --git a/conf/spf_dkim_whitelist.inc b/conf/maps.d/spf_dkim_whitelist.inc
similarity index 100%
rename from conf/spf_dkim_whitelist.inc
rename to conf/maps.d/spf_dkim_whitelist.inc

diff --git a/conf/surbl-whitelist.inc b/conf/maps.d/surbl-whitelist.inc
similarity index 100%
rename from conf/surbl-whitelist.inc
rename to conf/maps.d/surbl-whitelist.inc

diff --git a/conf/modules.d/mid.conf b/conf/modules.d/mid.conf
index 8c153b6b9adeb81e339e4d5e945a5e5a07bb9f97..5fd6794638f2a19905965a593d1f83cd314eb2e0 100644 (file)
--- a/conf/modules.d/mid.conf
+++ b/conf/modules.d/mid.conf
@@ -17,8 +17,9 @@ mid = {
   source = {
     url = [
       "https://maps.rspamd.com/rspamd/mid.inc.zst",
+      "$LOCAL_CONFDIR/local.d/maps.d/mid.inc",
       "$LOCAL_CONFDIR/local.d/mid.inc",
-      "fallback+file://${CONFDIR}/mid.inc"
+      "fallback+file://${CONFDIR}/maps.d/mid.inc"
     ];
   }
 

diff --git a/conf/modules.d/mime_types.conf b/conf/modules.d/mime_types.conf
index a92f426a330fd773fa16fb1171850462fe9f708f..ef9ab934b1bfdf16dab244032768aaa0b67aed77 100644 (file)
--- a/conf/modules.d/mime_types.conf
+++ b/conf/modules.d/mime_types.conf
@@ -16,8 +16,9 @@
 mime_types {
   file = [
     "https://maps.rspamd.com/rspamd/mime_types.inc.zst",
+    "$LOCAL_CONFDIR/local.d/maps.d/mime_types.inc.local",
     "${DBDIR}/mime_types.inc.local",
-    "fallback+file://${CONFDIR}/mime_types.inc"
+    "fallback+file://${CONFDIR}/maps.d/mime_types.inc"
   ]
 
   # Match specific extensions to specific content types

diff --git a/conf/modules.d/phishing.conf b/conf/modules.d/phishing.conf
index c86e2af41cc51c51667df098c0ee3b7966fabceb..bdace91232d8a63123b609b03b6cf508ff431324 100644 (file)
--- a/conf/modules.d/phishing.conf
+++ b/conf/modules.d/phishing.conf
@@ -25,8 +25,9 @@ phishing {
   # Make exclusions for known redirectors
   redirector_domains = [
     "https://maps.rspamd.com/rspamd/redirectors.inc.zst:REDIRECTOR_FALSE",
+    "$LOCAL_CONFDIR/local.d/maps.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE",
     "$LOCAL_CONFDIR/local.d/redirectors.inc:LOCAL_REDIRECTOR_FALSE",
-    "fallback+file://${CONFDIR}/redirectors.inc:REDIRECTOR_FALSE"
+    "fallback+file://${CONFDIR}/maps.d/redirectors.inc:REDIRECTOR_FALSE"
   ];
 
   .include(try=true,priority=5) "${DBDIR}/dynamic/phishing.conf"

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index e92ed945d43ea9f81ca4aff7512961c54b4cd694..1cdd73b2d48b5220ae426e2fab3b707aa0ec66e4 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -21,8 +21,9 @@ rbl {
 
   url_whitelist = [
     "https://maps.rspamd.com/rspamd/surbl-whitelist.inc.zst",
+    "$LOCAL_CONFDIR/local.d/maps.d/surbl-whitelist.inc.local",
     "${DBDIR}/surbl-whitelist.inc.local",
-    "fallback+file://${CONFDIR}/surbl-whitelist.inc"
+    "fallback+file://${CONFDIR}/maps.d/surbl-whitelist.inc"
   ];
 
   rbls {

diff --git a/conf/modules.d/whitelist.conf b/conf/modules.d/whitelist.conf
index aa0da31613c502ce02e8daf5b1aa34278917183f..b3bbd43293ca887a65296f5ac0bbcc1b862c2c0e 100644 (file)
--- a/conf/modules.d/whitelist.conf
+++ b/conf/modules.d/whitelist.conf
@@ -18,8 +18,9 @@ whitelist {
     "WHITELIST_SPF" = {
       valid_spf = true;
       domains = [
+        "$LOCAL_CONFDIR/local.d/maps.d/spf_whitelist.inc.local",
         "${DBDIR}/spf_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/spf_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/spf_whitelist.inc"
       ];
       score = -1.0
       inverse_symbol = "BLACKLIST_SPF";
@@ -28,8 +29,9 @@ whitelist {
     "WHITELIST_DKIM" = {
       valid_dkim = true;
       domains = [
+        "$LOCAL_CONFDIR/local.d/maps.d/dkim_whitelist.inc.local",
         "${DBDIR}/dkim_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/dkim_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/dkim_whitelist.inc"
       ];
       score = -1.0;
       inverse_symbol = "BLACKLIST_DKIM";
@@ -39,8 +41,9 @@ whitelist {
       valid_dkim = true;
       domains = [
         "https://maps.rspamd.com/rspamd/spf_dkim_whitelist.inc.zst",
+        "$LOCAL_CONFDIR/local.d/maps.d/spf_dkim_whitelist.inc.local",
         "${DBDIR}/spf_dkim_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/spf_dkim_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/spf_dkim_whitelist.inc"
       ];
       score = -3.0;
       inverse_symbol = "BLACKLIST_SPF_DKIM";
@@ -49,8 +52,9 @@ whitelist {
       valid_dmarc = true;
       domains = [
         "https://maps.rspamd.com/rspamd/dmarc_whitelist_new.inc.zst",
+        "$LOCAL_CONFDIR/local.d/maps.d/dmarc_whitelist.inc.local",
         "${DBDIR}/dmarc_whitelist.inc.local",
-        "fallback+file://${CONFDIR}/dmarc_whitelist.inc"
+        "fallback+file://${CONFDIR}/maps.d/dmarc_whitelist.inc"
       ];
       score = -7.0;
       inverse_symbol = "BLACKLIST_DMARC";

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index 5f4b5b07f63c7fd922369811ec392381f2634d71..a0a09ce46072c92bb5613043049e1a82fae29388 100644 (file)
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -21,11 +21,11 @@ greylist {
   # Search "example.com" and "mail.example.com" for "mx.out.mail.example.com":
   whitelist_domains_url = [
     "$LOCAL_CONFDIR/local.d/greylist-whitelist-domains.inc",
-    "${CONFDIR}/maillist.inc",
-    "${CONFDIR}/redirectors.inc",
-    "${CONFDIR}/dmarc_whitelist.inc",
-    "${CONFDIR}/spf_dkim_whitelist.inc",
-    "${CONFDIR}/surbl-whitelist.inc",
+    "${CONFDIR}/maps.d/maillist.inc",
+    "${CONFDIR}/maps.d/redirectors.inc",
+    "${CONFDIR}/maps.d/dmarc_whitelist.inc",
+    "${CONFDIR}/maps.d/spf_dkim_whitelist.inc",
+    "${CONFDIR}/maps.d/surbl-whitelist.inc",
     "https://maps.rspamd.com/freemail/free.txt.zst"
   ];
 }