瀏覽代碼

[Rspamd] Remove antivirus debugging

André 7 年之前
父節點
當前提交
27d3388579
共有 3 個文件被更改,包括 7 次插入5 次删除
  1. 4 1
      data/Dockerfiles/phpfpm/docker-entrypoint.sh
  2. 0 1
      data/conf/rspamd/override.d/logging.inc
  3. 3 3
      docker-compose.yml

+ 4 - 1
data/Dockerfiles/phpfpm/docker-entrypoint.sh

@@ -32,7 +32,10 @@ fi
 
 
 # Set API options if env vars are not empty
 # 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}"
   IFS=',' read -r -a API_ALLOW_FROM_ARR <<< "${API_ALLOW_FROM}"
   declare -a VALIDATED_API_ALLOW_FROM_ARR
   declare -a VALIDATED_API_ALLOW_FROM_ARR
   REGEX_IP6='^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$'
   REGEX_IP6='^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$'

+ 0 - 1
data/conf/rspamd/override.d/logging.inc

@@ -2,4 +2,3 @@ type = "console";
 systemd = false;
 systemd = false;
 .include "$CONFDIR/logging.inc"
 .include "$CONFDIR/logging.inc"
 .include(try=true; priority=20) "$CONFDIR/override.d/logging.custom.inc"
 .include(try=true; priority=20) "$CONFDIR/override.d/logging.custom.inc"
-debug_modules = ["antivirus"];

+ 3 - 3
docker-compose.yml

@@ -104,7 +104,7 @@ services:
             - rspamd
             - rspamd
 
 
     php-fpm-mailcow:
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.15
+      image: mailcow/phpfpm:1.16
       build: ./data/Dockerfiles/phpfpm
       build: ./data/Dockerfiles/phpfpm
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
       depends_on:
@@ -133,8 +133,8 @@ services:
         - SUBMISSION_PORT=${SUBMISSION_PORT:-587}
         - SUBMISSION_PORT=${SUBMISSION_PORT:-587}
         - SMTPS_PORT=${SMTPS_PORT:-465}
         - SMTPS_PORT=${SMTPS_PORT:-465}
         - SMTP_PORT=${SMTP_PORT:-25}
         - 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
       restart: always
       sysctls:
       sysctls:
         - net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}
         - net.ipv6.conf.all.disable_ipv6=${SYSCTL_IPV6_DISABLED:-0}