From 1925b2e0fb0f6844407e8b114e1cb67e7b7116be Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Wed, 24 Nov 2021 16:46:35 +0100 Subject: [PATCH 1/2] Upgrade rspamd --- core/rspamd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/rspamd/Dockerfile b/core/rspamd/Dockerfile index 33174c1a..6ec211c4 100644 --- a/core/rspamd/Dockerfile +++ b/core/rspamd/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14.2 +ARG DISTRO=alpine:3.15 FROM $DISTRO ENV TZ Etc/UTC From 89a7a8ac13f20b595d3dd21310494cbafa657013 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Thu, 25 Nov 2021 15:29:31 +0100 Subject: [PATCH 2/2] Fix score of RCVD_NO_TLS_LAST --- core/rspamd/conf/headers_group.conf | 7 +++++++ core/rspamd/conf/settings.conf | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 core/rspamd/conf/headers_group.conf delete mode 100644 core/rspamd/conf/settings.conf diff --git a/core/rspamd/conf/headers_group.conf b/core/rspamd/conf/headers_group.conf new file mode 100644 index 00000000..bae6f02b --- /dev/null +++ b/core/rspamd/conf/headers_group.conf @@ -0,0 +1,7 @@ +symbols = { + "RCVD_NO_TLS_LAST" { + # see https://github.com/Mailu/Mailu/issues/1705 + weight = 0.0; + description = "Last hop did not use encrypted transports"; + } +} diff --git a/core/rspamd/conf/settings.conf b/core/rspamd/conf/settings.conf deleted file mode 100644 index 01e9780f..00000000 --- a/core/rspamd/conf/settings.conf +++ /dev/null @@ -1,4 +0,0 @@ -apply { - # see https://github.com/Mailu/Mailu/issues/1705 - RCVD_NO_TLS_LAST = 0; -}