diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 8bc81c97..9b92b61e 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -32,7 +32,10 @@ fi # Set API options if env vars are not empty -if [[ ! -z ${API_ALLOW_FROM} ]] && [[ ! -z ${API_KEY} ]]; then +if [[ ${API_ALLOW_FROM} != "invalid" ]] && \ + [[ ${API_KEY} != "invalid" ]] && \ + [[ ! -z ${API_KEY} ]] && \ + [[ ! -z ${API_ALLOW_FROM} ]]; then IFS=',' read -r -a API_ALLOW_FROM_ARR <<< "${API_ALLOW_FROM}" declare -a VALIDATED_API_ALLOW_FROM_ARR REGEX_IP6='^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$' diff --git a/data/conf/rspamd/override.d/logging.inc b/data/conf/rspamd/override.d/logging.inc index 3401fec5..23a9f3cf 100644 --- a/data/conf/rspamd/override.d/logging.inc +++ b/data/conf/rspamd/override.d/logging.inc @@ -2,4 +2,3 @@ type = "console"; systemd = false; .include "$CONFDIR/logging.inc" .include(try=true; priority=20) "$CONFDIR/override.d/logging.custom.inc" -debug_modules = ["antivirus"]; diff --git a/docker-compose.yml b/docker-compose.yml index 1b888659..4d09e8e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -104,7 +104,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.15 + image: mailcow/phpfpm:1.16 build: ./data/Dockerfiles/phpfpm command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: @@ -133,8 +133,8 @@ services: - SUBMISSION_PORT=${SUBMISSION_PORT:-587} - SMTPS_PORT=${SMTPS_PORT:-465} - SMTP_PORT=${SMTP_PORT:-25} - - API_KEY=${API_KEY:-} - - API_ALLOW_FROM=${API_ALLOW_FROM:-} + - API_KEY=${API_KEY:-invalid} + - API_ALLOW_FROM=${API_ALLOW_FROM:-invalid} restart: always sysctls: - net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}