From 7304add08461fea25aa3645c1b713fb3d963a251 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 23 Jun 2020 21:22:22 +0200 Subject: [PATCH] [Watchdog] Update compose file, update image [Rspamd] Temporarily disable over-signing, as Cyren does mark those mails as DKIM invalid (blame them, not us) --- data/conf/rspamd/local.d/dkim_signing.conf | 1 + docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/conf/rspamd/local.d/dkim_signing.conf b/data/conf/rspamd/local.d/dkim_signing.conf index 575e86b5c..5e44578f9 100644 --- a/data/conf/rspamd/local.d/dkim_signing.conf +++ b/data/conf/rspamd/local.d/dkim_signing.conf @@ -32,3 +32,4 @@ selector_prefix = "DKIM_SELECTORS"; # forwards are arc signed, rejects are dkim signed sign_networks = "/etc/rspamd/custom/dovecot_trusted.map"; use_domain_sign_networks = "header"; +sign_headers = "from:sender:reply-to:subject:date:message-id:to:cc:mime-version:content-type:content-transfer-encoding:resent-to:resent-cc:resent-from:resent-sender:resent-message-id:in-reply-to:references:list-id:list-help:list-owner:list-unsubscribe:list-subscribe:list-post:openpgp:autocrypt"; diff --git a/docker-compose.yml b/docker-compose.yml index 6ffed11f9..239591b8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -398,7 +398,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.79 + image: mailcow/watchdog:1.80 # Debug #command: /watchdog.sh dns: @@ -442,7 +442,7 @@ services: - POSTFIX_THRESHOLD=8 - CLAMD_THRESHOLD=15 - DOVECOT_THRESHOLD=12 - - DOVECOT_REPL_THRESHOLD=2 + - DOVECOT_REPL_THRESHOLD=20 - PHPFPM_THRESHOLD=5 - RATELIMIT_THRESHOLD=1 - FAIL2BAN_THRESHOLD=1