aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--centos/rspamd.spec10
-rw-r--r--conf/maps.d/dmarc_whitelist.inc (renamed from conf/dmarc_whitelist.inc)0
-rw-r--r--conf/maps.d/maillist.inc (renamed from conf/maillist.inc)0
-rw-r--r--conf/maps.d/mid.inc (renamed from conf/mid.inc)0
-rw-r--r--conf/maps.d/mime_types.inc (renamed from conf/mime_types.inc)0
-rw-r--r--conf/maps.d/redirectors.inc (renamed from conf/redirectors.inc)0
-rw-r--r--conf/maps.d/spf_dkim_whitelist.inc (renamed from conf/spf_dkim_whitelist.inc)0
-rw-r--r--conf/maps.d/surbl-whitelist.inc (renamed from conf/surbl-whitelist.inc)0
-rw-r--r--conf/modules.d/mid.conf3
-rw-r--r--conf/modules.d/mime_types.conf3
-rw-r--r--conf/modules.d/phishing.conf3
-rw-r--r--conf/modules.d/rbl.conf3
-rw-r--r--conf/modules.d/whitelist.conf12
-rw-r--r--src/plugins/lua/greylist.lua10
14 files changed, 26 insertions, 18 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index 1af0c5fb4..c5f0ee4e1 100644
--- 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
index ca8c2148d..ca8c2148d 100644
--- a/conf/dmarc_whitelist.inc
+++ b/conf/maps.d/dmarc_whitelist.inc
diff --git a/conf/maillist.inc b/conf/maps.d/maillist.inc
index 97b2158f0..97b2158f0 100644
--- a/conf/maillist.inc
+++ b/conf/maps.d/maillist.inc
diff --git a/conf/mid.inc b/conf/maps.d/mid.inc
index aeb54542e..aeb54542e 100644
--- a/conf/mid.inc
+++ b/conf/maps.d/mid.inc
diff --git a/conf/mime_types.inc b/conf/maps.d/mime_types.inc
index 746ed05ce..746ed05ce 100644
--- a/conf/mime_types.inc
+++ b/conf/maps.d/mime_types.inc
diff --git a/conf/redirectors.inc b/conf/maps.d/redirectors.inc
index 812f40539..812f40539 100644
--- a/conf/redirectors.inc
+++ b/conf/maps.d/redirectors.inc
diff --git a/conf/spf_dkim_whitelist.inc b/conf/maps.d/spf_dkim_whitelist.inc
index fe0ddbbaa..fe0ddbbaa 100644
--- a/conf/spf_dkim_whitelist.inc
+++ b/conf/maps.d/spf_dkim_whitelist.inc
diff --git a/conf/surbl-whitelist.inc b/conf/maps.d/surbl-whitelist.inc
index b0efda20a..b0efda20a 100644
--- a/conf/surbl-whitelist.inc
+++ b/conf/maps.d/surbl-whitelist.inc
diff --git a/conf/modules.d/mid.conf b/conf/modules.d/mid.conf
index 8c153b6b9..5fd679463 100644
--- 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 a92f426a3..ef9ab934b 100644
--- 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 c86e2af41..bdace9123 100644
--- 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 e92ed945d..1cdd73b2d 100644
--- 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 aa0da3161..b3bbd4329 100644
--- 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 5f4b5b07f..a0a09ce46 100644
--- 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"
];
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 15:51:14 +0000