[Rspamd] Remove antivirus debugging

master
André 2018-06-10 14:30:30 +02:00
parent 0d9b474f69
commit 27d3388579
3 changed files with 7 additions and 5 deletions

View File

@ -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}$'

View File

@ -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"];

View File

@ -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}