Browse Source

[Conf] Introduce maps.d directories

tags/2.0
moisseev 4 years ago
parent
commit
69f50374bb

+ 5
- 5
centos/rspamd.spec View File

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

conf/dmarc_whitelist.inc → conf/maps.d/dmarc_whitelist.inc View File


conf/maillist.inc → conf/maps.d/maillist.inc View File


conf/mid.inc → conf/maps.d/mid.inc View File


conf/mime_types.inc → conf/maps.d/mime_types.inc View File


conf/redirectors.inc → conf/maps.d/redirectors.inc View File


conf/spf_dkim_whitelist.inc → conf/maps.d/spf_dkim_whitelist.inc View File


conf/surbl-whitelist.inc → conf/maps.d/surbl-whitelist.inc View File


+ 2
- 1
conf/modules.d/mid.conf View File

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


+ 2
- 1
conf/modules.d/mime_types.conf View File

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

+ 2
- 1
conf/modules.d/phishing.conf View File

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

+ 2
- 1
conf/modules.d/rbl.conf View File

@@ -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 {

+ 8
- 4
conf/modules.d/whitelist.conf View File

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

+ 5
- 5
src/plugins/lua/greylist.lua View File

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

Loading…
Cancel
Save