aboutsummaryrefslogtreecommitdiffstats
path: root/conf/modules.d
diff options
context:
space:
mode:
authormoisseev <moiseev@mezonplus.ru>2019-09-17 10:35:41 +0300
committermoisseev <moiseev@mezonplus.ru>2019-09-18 10:05:22 +0300
commit69f50374bbba64882caa11c38362dc6101e343c6 (patch)
tree62b37388ff401b1da0116ca6afd84a50416f8db4 /conf/modules.d
parentd4be8b2d633c57f8f3695dbe4ce9e3407bc1046b (diff)
downloadrspamd-69f50374bbba64882caa11c38362dc6101e343c6.tar.gz
rspamd-69f50374bbba64882caa11c38362dc6101e343c6.zip
[Conf] Introduce maps.d directories
Diffstat (limited to 'conf/modules.d')
-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
5 files changed, 16 insertions, 8 deletions
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";