self-hosted/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-11-24 08:32:50 +02:00
Code Issues Releases Activity

rspamd: fixed dqs rbl insertion handling

Browse Source
This commit is contained in:
DerLinkman 2024-08-01 12:37:49 +02:00
parent 5d7c9b20bc
commit b6c036496d
No known key found for this signature in database
GPG Key ID: AA4A82514748F5A9
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
data/Dockerfiles/rspamd/docker-entrypoint.sh
View File

@ -128,7 +128,6 @@ done
if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
cat <<EOF > /etc/rspamd/custom/dqs-rbl.conf cat <<EOF > /etc/rspamd/custom/dqs-rbl.conf
# Autogenerated by mailcow. DO NOT TOUCH! # Autogenerated by mailcow. DO NOT TOUCH!
rbls {
spamhaus { spamhaus {
rbl = "${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net"; rbl = "${SPAMHAUS_DQS_KEY}.zen.dq.spamhaus.net";
from = false; from = false;
@ -221,7 +220,7 @@ if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
replyto = true; replyto = true;
emails_domainonly = true; emails_domainonly = true;
disable_monitoring = true; disable_monitoring = true;
rbl = "${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net" rbl = "${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net";
returncodes = { returncodes = {
SH_EMAIL_DBL = [ SH_EMAIL_DBL = [
"127.0.1.2", "127.0.1.2",
@ -243,7 +242,7 @@ if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
replyto = true; replyto = true;
emails_domainonly = true; emails_domainonly = true;
disable_monitoring = true; disable_monitoring = true;
rbl = "${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net" rbl = "${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net";
returncodes = { returncodes = {
SH_EMAIL_ZRD_VERY_FRESH_DOMAIN = ["127.0.2.2", "127.0.2.3", "127.0.2.4"]; SH_EMAIL_ZRD_VERY_FRESH_DOMAIN = ["127.0.2.2", "127.0.2.3", "127.0.2.4"];
SH_EMAIL_ZRD_FRESH_DOMAIN = [ SH_EMAIL_ZRD_FRESH_DOMAIN = [
@ -251,26 +250,26 @@ if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
]; ];
SH_EMAIL_ZRD_DONT_QUERY_IPS = [ "127.0.2.255" ]; SH_EMAIL_ZRD_DONT_QUERY_IPS = [ "127.0.2.255" ];
} }
} }
"DBL" { "DBL" {
# override the defaults for DBL defined in modules.d/rbl.conf # override the defaults for DBL defined in modules.d/rbl.conf
rbl = "${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net"; rbl = "${SPAMHAUS_DQS_KEY}.dbl.dq.spamhaus.net";
disable_monitoring = true; disable_monitoring = true;
} }
"ZRD" { "ZRD" {
ignore_defaults = true; ignore_defaults = true;
rbl = "${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net"; rbl = "${SPAMHAUS_DQS_KEY}.zrd.dq.spamhaus.net";
no_ip = true; no_ip = true;
dkim = true; dkim = true;
emails = true; emails = true;
emails_domainonly = true; emails_domainonly = true;
urls = true; urls = true;
returncodes = { returncodes = {
ZRD_VERY_FRESH_DOMAIN = ["127.0.2.2", "127.0.2.3", "127.0.2.4"]; ZRD_VERY_FRESH_DOMAIN = ["127.0.2.2", "127.0.2.3", "127.0.2.4"];
ZRD_FRESH_DOMAIN = ["127.0.2.5", "127.0.2.6", "127.0.2.7", "127.0.2.8", "127.0.2.9", "127.0.2.10", "127.0.2.11", "127.0.2.12", "127.0.2.13", "127.0.2.14", "127.0.2.15", "127.0.2.16", "127.0.2.17", "127.0.2.18", "127.0.2.19", "127.0.2.20", "127.0.2.21", "127.0.2.22", "127.0.2.23", "127.0.2.24"]; ZRD_FRESH_DOMAIN = ["127.0.2.5", "127.0.2.6", "127.0.2.7", "127.0.2.8", "127.0.2.9", "127.0.2.10", "127.0.2.11", "127.0.2.12", "127.0.2.13", "127.0.2.14", "127.0.2.15", "127.0.2.16", "127.0.2.17", "127.0.2.18", "127.0.2.19", "127.0.2.20", "127.0.2.21", "127.0.2.22", "127.0.2.23", "127.0.2.24"];
} }
} }
spamhaus_sbl_url { spamhaus_sbl_url {
ignore_defaults = true ignore_defaults = true
rbl = "${SPAMHAUS_DQS_KEY}.sbl.dq.spamhaus.net"; rbl = "${SPAMHAUS_DQS_KEY}.sbl.dq.spamhaus.net";
checks = ['urls']; checks = ['urls'];
@ -306,7 +305,6 @@ if [[ ! -z ${SPAMHAUS_DQS_KEY} ]]; then
SH_HBL_FILE_SUSPICIOUS = "127.0.3.15"; SH_HBL_FILE_SUSPICIOUS = "127.0.3.15";
} }
} }
}
EOF EOF
else else
rm -rf /etc/rspamd/custom/dqs-rbl.conf rm -rf /etc/rspamd/custom/dqs-rbl.conf

2
data/conf/rspamd/local.d/rbl.conf
View File

@ -21,6 +21,6 @@ rbls {
} }
} }
.include(try=true,priority=5) "$LOCAL_CONFDIR/custom/dqs-rbl.conf" .include(try=true,override=true,priority=5) "$LOCAL_CONFDIR/custom/dqs-rbl.conf"
} }