1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00

Update whitelist and check if custom whitelist exists

This commit is contained in:
Michael Kroes 2019-07-16 21:40:40 +02:00
parent b3b02ee91f
commit 3d8586702e
2 changed files with 4 additions and 1 deletions

View File

@ -3,3 +3,4 @@
/^mta-aws\d+\.sanomacorp\.net$/ /^mta-aws\d+\.sanomacorp\.net$/
/^mail.*\.mandrillapp\.com$/ /^mail.*\.mandrillapp\.com$/
/^mail\d+\.ikea.com$/ /^mail\d+\.ikea.com$/
/^webgride\d+\.emsecure.net$/

View File

@ -254,7 +254,9 @@ if [ ! -f /etc/postgrey/whitelist_clients ] || find /etc/postgrey/whitelist_clie
# before moving it into place # before moving it into place
if [ \$(file -b --mime-type /tmp/postgrey_whitelist_clients) == "text/plain" ]; then if [ \$(file -b --mime-type /tmp/postgrey_whitelist_clients) == "text/plain" ]; then
mv /tmp/postgrey_whitelist_clients /etc/postgrey/whitelist_clients mv /tmp/postgrey_whitelist_clients /etc/postgrey/whitelist_clients
if [ -f /root/mailinabox/conf/postgrey_whitelist_clients ] ; then
cat /root/mailinabox/conf/postgrey_whitelist_clients >> /etc/postgrey/whitelist_clients cat /root/mailinabox/conf/postgrey_whitelist_clients >> /etc/postgrey/whitelist_clients
fi
else else
rm /tmp/postgrey_whitelist_clients rm /tmp/postgrey_whitelist_clients
fi fi