From 24a567c3bed4123cd7baf46e0e17e3dfd8e52139 Mon Sep 17 00:00:00 2001 From: Jeff Volkenant Date: Fri, 6 Sep 2019 12:59:30 -0700 Subject: [PATCH] Fix mailinabox-postgrey-whitelist cron job return code for file over 28 days Merges #1639 --- CHANGELOG.md | 4 ++++ setup/mail-postfix.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1bdab0..1ee9280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Software updates: * Upgraded Nextcloud from 15.0.8 to 16.0.5 (with Contacts from 3.1.1 to 3.1.4 and Calendar from 1.6.5 to 1.7.1) +Mail: + +* Fetching of updated whitelist for greylisting was fetching each day instead of every month. + v0.43 (September 1, 2019) ------------------------- diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh index 283d08a..e39f8af 100755 --- a/setup/mail-postfix.sh +++ b/setup/mail-postfix.sh @@ -218,7 +218,7 @@ cat > /etc/cron.daily/mailinabox-postgrey-whitelist << EOF; # Mail-in-a-Box # check we have a postgrey_whitelist_clients file and that it is not older than 28 days -if [ ! -f /etc/postgrey/whitelist_clients ] || find /etc/postgrey/whitelist_clients -mtime +28 > /dev/null ; then +if [ ! -f /etc/postgrey/whitelist_clients ] || find /etc/postgrey/whitelist_clients -mtime +28 | grep -q '.' ; then # ok we need to update the file, so lets try to fetch it if curl https://postgrey.schweikert.ch/pub/postgrey_whitelist_clients --output /tmp/postgrey_whitelist_clients -sS --fail > /dev/null 2>&1 ; then # if fetching hasn't failed yet then check it is a plain text file