From b20ff13e40c45083386bd7a17065749bfc702f3a Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 6 May 2019 12:18:37 +0200 Subject: [PATCH] [Rspamd] Update to 1.9.2, minor entrypoint changes [Compose] Update Rspamd to 1.9.2 --- data/Dockerfiles/rspamd/docker-entrypoint.sh | 16 +++++++++++++++- docker-compose.yml | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/rspamd/docker-entrypoint.sh b/data/Dockerfiles/rspamd/docker-entrypoint.sh index 6288550d..6facf35a 100755 --- a/data/Dockerfiles/rspamd/docker-entrypoint.sh +++ b/data/Dockerfiles/rspamd/docker-entrypoint.sh @@ -1,7 +1,21 @@ #!/bin/bash -chown -R _rspamd:_rspamd /var/lib/rspamd /etc/rspamd/local.d /etc/rspamd/override.d /etc/rspamd/custom +mkdir -p /etc/rspamd/plugins.d \ + /etc/rspamd/custom + +touch /etc/rspamd/rspamd.conf.local \ + /etc/rspamd/rspamd.conf.override + +chown -R _rspamd:_rspamd /var/lib/rspamd \ + /etc/rspamd/local.d \ + /etc/rspamd/override.d \ + /etc/rspamd/custom \ + /etc/rspamd/rspamd.conf.local \ + /etc/rspamd/rspamd.conf.override \ + /etc/rspamd/plugins.d + chmod 755 /var/lib/rspamd + [[ ! -f /etc/rspamd/override.d/worker-controller-password.inc ]] && echo '# Placeholder' > /etc/rspamd/override.d/worker-controller-password.inc chown _rspamd:_rspamd /etc/rspamd/override.d/worker-controller-password.inc [[ ! -f /etc/rspamd/custom/sa-rules-heinlein ]] && echo '# to be auto-filled by dovecot-mailcow' > /etc/rspamd/custom/sa-rules-heinlein diff --git a/docker-compose.yml b/docker-compose.yml index 70864056..a55ab5d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,7 +71,7 @@ services: - clamd rspamd-mailcow: - image: mailcow/rspamd:1.39 + image: mailcow/rspamd:1.40 build: ./data/Dockerfiles/rspamd stop_grace_period: 30s depends_on: