From b17543f211c9e4a57546653abd6b4efbb25a4074 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 23 May 2017 21:50:48 +0200 Subject: [PATCH] Fixes --- data/Dockerfiles/rspamd/Dockerfile | 2 ++ data/Dockerfiles/rspamd/docker-entrypoint.sh | 10 ---------- data/Dockerfiles/rspamd/settings.conf | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 100755 data/Dockerfiles/rspamd/docker-entrypoint.sh diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 42f2afc2..61087f3a 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -16,6 +16,8 @@ RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspam COPY settings.conf /etc/rspamd/modules.d/settings.conf COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf COPY dkim_signing.lua /usr/share/rspamd/lua/dkim_signing.lua +# Workaround +RUN rm /etc/rspamd/modules.d/fann_redis.conf RUN apt-get autoremove --purge \ && apt-get clean diff --git a/data/Dockerfiles/rspamd/docker-entrypoint.sh b/data/Dockerfiles/rspamd/docker-entrypoint.sh deleted file mode 100755 index c1101d94..00000000 --- a/data/Dockerfiles/rspamd/docker-entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e - -if [[ ! -d "/data/dkim/txt" || ! -d "/data/dkim/keys" ]] ; then mkdir -p /data/dkim/{txt,keys} ; chown -R www-data:www-data /data/dkim; fi -if [[ $(stat -c %U /data/dkim/) != "www-data" ]] ; then chown -R www-data:www-data /data/dkim ; fi - -# Migrate domain table to redis - - -exec "$@" diff --git a/data/Dockerfiles/rspamd/settings.conf b/data/Dockerfiles/rspamd/settings.conf index 4449f091..3c1c9c16 100644 --- a/data/Dockerfiles/rspamd/settings.conf +++ b/data/Dockerfiles/rspamd/settings.conf @@ -1 +1 @@ -settings = "http://nginx:8081/settings.php"; +settings = "http://172.22.1.251:8081/settings.php";