[Conf] Introduce maps.d directories

centos/rspamd.spec

 %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
 %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

conf/modules.d/mid.conf

   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"
     ];
   }
 

conf/modules.d/mime_types.conf

 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

conf/modules.d/phishing.conf

   # 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"

conf/modules.d/rbl.conf

 
   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 {

conf/modules.d/whitelist.conf

     "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";
     "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";
       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";
       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";

src/plugins/lua/greylist.lua

   # 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"
   ];
 }