diff --git a/Stable2.0/docker-entrypoint.sh b/Stable2.0/docker-entrypoint.sh index f7c2203..969507e 100644 --- a/Stable2.0/docker-entrypoint.sh +++ b/Stable2.0/docker-entrypoint.sh @@ -11,41 +11,19 @@ chmod 755 /var/lib/rspamd [[ ! -f /etc/rspamd/override.d/worker-controller-password.inc ]] && echo '# Autogenerated' > /etc/rspamd/override.d/worker-controller-password.inc -if [[ ! -z ${REDIS_SLAVEOF_IP} ]]; then - cat < /etc/rspamd/local.d/redis.conf -read_servers = "redis:6379"; -write_servers = "${REDIS_SLAVEOF_IP}:${REDIS_SLAVEOF_PORT}"; -timeout = 10; -EOF - until [[ $(redis-cli -h redis-mailcow PING) == "PONG" ]]; do - echo "Waiting for Redis @redis-mailcow..." - sleep 2 - done - until [[ $(redis-cli -h ${REDIS_SLAVEOF_IP} -p ${REDIS_SLAVEOF_PORT} PING) == "PONG" ]]; do - echo "Waiting for Redis @${REDIS_SLAVEOF_IP}..." - sleep 2 - done - redis-cli -h redis-mailcow SLAVEOF ${REDIS_SLAVEOF_IP} ${REDIS_SLAVEOF_PORT} -else - cat < /etc/rspamd/local.d/redis.conf -servers = "redis:6379"; -timeout = 10; -db = 1 -EOF -fi - # Provide additional lua modules ln -s /usr/lib/$(uname -m)-linux-gnu/liblua5.1-cjson.so.0.0.0 /usr/lib/rspamd/cjson.so chown -R _rspamd:_rspamd /var/lib/rspamd \ /etc/rspamd/local.d \ + /etc/rspamd/custom \ /etc/rspamd/override.d \ /etc/rspamd/rspamd.conf.local \ /etc/rspamd/rspamd.conf.override \ /etc/rspamd/plugins.d # Fix missing default global maps, if any -# These exists in mailcow UI and should not be removed +# These exists in UI and should not be removed touch /etc/rspamd/custom/global_mime_from_blacklist.map \ /etc/rspamd/custom/global_rcpt_blacklist.map \ /etc/rspamd/custom/global_smtp_from_blacklist.map \