Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Web] Filter duplicates when adding multiple transports

Browse Source
This commit is contained in:
andryyy 2019-10-30 14:37:44 +01:00
parent 78f5ac34dd
commit 59df735aa8
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/Dockerfiles/rspamd/docker-entrypoint.sh
View File

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

2
data/web/inc/functions.transports.inc.php
View File

@ -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)) {

2
docker-compose.yml
View File

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