From a86a7f6dd5547c86181fa349880e2915a3c5cea5 Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Tue, 16 Jul 2019 12:04:12 +0200
Subject: [PATCH] Updated the Postgrey whitelist to a newer version, this will
 be auto updated once a month.

---
 CHANGELOG.md          |  6 ++++++
 setup/mail-postfix.sh | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15311c84..7677666a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+In Development
+--------------
+
+Postgrey:
+* Fetch an updated whitelist for Postgrey on a monthly basis
+
 v0.42 (July 4, 2019)
 --------------------
 
diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh
index 4d66cd58..fc0a1e49 100755
--- a/setup/mail-postfix.sh
+++ b/setup/mail-postfix.sh
@@ -210,6 +210,16 @@ tools/editconf.py /etc/postfix/main.cf \
 tools/editconf.py /etc/default/postgrey \
 	POSTGREY_OPTS=\"'--inet=127.0.0.1:10023 --delay=180'\"
 
+
+# We are going to setup a newer whitelist for postgrey, the version included in the distribution is old
+cat > /etc/cron.monthly/mailinabox-postgrey-whitelist << EOF;
+#!/bin/bash
+# Mail-in-a-Box
+curl http://postgrey.schweikert.ch/pub/postgrey_whitelist_clients --output /etc/postgrey/whitelist_clients -ss
+EOF
+chmod +x /etc/cron.monthly/mailinabox-postgrey-whitelist
+/etc/cron.monthly/mailinabox-postgrey-whitelist
+
 # Increase the message size limit from 10MB to 128MB.
 # The same limit is specified in nginx.conf for mail submitted via webmail and Z-Push.
 tools/editconf.py /etc/postfix/main.cf \