瀏覽代碼

[Web] Filter duplicates when adding multiple transports

andryyy 5 年之前
父節點
當前提交
59df735aa8
共有 3 個文件被更改,包括 2 次插入5 次删除
  1. 0 3
      data/Dockerfiles/rspamd/docker-entrypoint.sh
  2. 1 1
      data/web/inc/functions.transports.inc.php
  3. 1 1
      docker-compose.yml

+ 0 - 3
data/Dockerfiles/rspamd/docker-entrypoint.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 #!/bin/bash
 
 
-echo "Waiting for PHP to settle..."
-sleep 10
-
 until nc phpfpm 9001 -z; do
 until nc phpfpm 9001 -z; do
   echo "Waiting for PHP on port 9001..."
   echo "Waiting for PHP on port 9001..."
   sleep 3
   sleep 3

+ 1 - 1
data/web/inc/functions.transports.inc.php

@@ -243,7 +243,7 @@ function transport($_action, $_data = null) {
           }
           }
         }
         }
       }
       }
-      $destinations = array_values($destinations);
+      $destinations = array_values(array_unique($destinations));
       if (empty($destinations)) { return false; }
       if (empty($destinations)) { return false; }
       if (isset($next_hop_matches[1])) {
       if (isset($next_hop_matches[1])) {
         if (in_array($next_hop_clean, $existing_nh)) {
         if (in_array($next_hop_clean, $existing_nh)) {

+ 1 - 1
docker-compose.yml

@@ -68,7 +68,7 @@ services:
             - clamd
             - clamd
 
 
     rspamd-mailcow:
     rspamd-mailcow:
-      image: mailcow/rspamd:1.51
+      image: mailcow/rspamd:1.52
       build: ./data/Dockerfiles/rspamd
       build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       stop_grace_period: 30s
       depends_on:
       depends_on: