From 1bf99908b2ca6aa782db8b98effecda27c5de185 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 17 Oct 2024 11:25:24 +0200 Subject: [PATCH 1/2] rspamd: upgrade to 3.10.1 --- data/Dockerfiles/rspamd/Dockerfile | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index df15a0bedc..ca4f9f71dd 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -1,8 +1,8 @@ FROM debian:bookworm-slim -LABEL maintainer = "The Infrastructure Company GmbH " +LABEL maintainer="The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive -ARG RSPAMD_VER=rspamd_3.9.1-1~82f43560f +ARG RSPAMD_VER=rspamd_3.10.1-1~9de95c2b6 ARG CODENAME=bookworm ENV LC_ALL=C diff --git a/docker-compose.yml b/docker-compose.yml index 01f8ee90b9..110de288dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,7 +80,7 @@ services: - clamd rspamd-mailcow: - image: mailcow/rspamd:1.97 + image: mailcow/rspamd:1.98 stop_grace_period: 30s depends_on: - dovecot-mailcow From 1521f12e05ba4d3c930ebcb5aa731f41919542ab Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 17 Oct 2024 14:40:34 +0200 Subject: [PATCH 2/2] rspamd: adapt 30s task timeout per default now --- data/conf/rspamd/local.d/options.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/conf/rspamd/local.d/options.inc b/data/conf/rspamd/local.d/options.inc index 105bbdcd8a..99197ff558 100644 --- a/data/conf/rspamd/local.d/options.inc +++ b/data/conf/rspamd/local.d/options.inc @@ -2,6 +2,7 @@ dns { enable_dnssec = true; } map_watch_interval = 30s; +task_timeout = 30s; disable_monitoring = true; # In case a task times out (like DNS lookup), soft reject the message # instead of silently accepting the message without further processing.