From 395f0f7a3d0d58f584149eeb5d33991dd468cd10 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 29 May 2019 18:02:14 +0200 Subject: [PATCH] [Rspamd] Remove authenticated user from auth results header [Dovecot] Fix permissions of console [Compose] New Dovecot image --- data/Dockerfiles/dovecot/docker-entrypoint.sh | 1 + data/conf/rspamd/local.d/milter_headers.conf | 1 + docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh index 1ed3e9f8..e11977b8 100755 --- a/data/Dockerfiles/dovecot/docker-entrypoint.sh +++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh @@ -193,6 +193,7 @@ chown -R vmail:vmail /var/vmail/sieve chown -R vmail:vmail /var/volatile adduser vmail tty chmod g+rw /dev/console +chown root:tty /dev/console chmod +x /usr/local/lib/dovecot/sieve/rspamd-pipe-ham \ /usr/local/lib/dovecot/sieve/rspamd-pipe-spam \ /usr/local/bin/imapsync_cron.pl \ diff --git a/data/conf/rspamd/local.d/milter_headers.conf b/data/conf/rspamd/local.d/milter_headers.conf index 7f21b8e0..d8d40258 100644 --- a/data/conf/rspamd/local.d/milter_headers.conf +++ b/data/conf/rspamd/local.d/milter_headers.conf @@ -13,6 +13,7 @@ routines { authentication-results { header = "Authentication-Results"; remove = 1; + add_smtp_user = false; spf_symbols { pass = "R_SPF_ALLOW"; fail = "R_SPF_FAIL"; diff --git a/docker-compose.yml b/docker-compose.yml index 71f620a6..fcf3f824 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -173,7 +173,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.75 + image: mailcow/dovecot:1.76 build: ./data/Dockerfiles/dovecot cap_add: - NET_BIND_SERVICE