Merge branch 'postgrey/delay/clean' of https://github.com/Xoib/mailinabox

Closes #413.

CHANGELOG.md

@@ -9,6 +9,7 @@ In Development
 * Users and aliases weren't working if they were entered with any uppercase letters. Now only lowercase is allowed.
 * Fix broken install on OVH VPS's.
 * After installing an SSL certificate from the control panel, the page wasn't being refreshed.
+* The minimum greylisting delay has been reduced from 5 minutes to 3 minutes.
 
 v0.09 (May 8, 2015)
 -------------------

setup/mail-postfix.sh

@@ -171,8 +171,13 @@ tools/editconf.py /etc/postfix/main.cf \
 
 # Postfix connects to Postgrey on the 127.0.0.1 interface specifically. Ensure that
 # Postgrey listens on the same interface (and not IPv6, for instance).
+# A lot of legit mail servers try to resend before 300 seconds.
+# As a matter of fact RFC is not strict about retry timer so postfix and
+# other MTA have their own intervals. To fix the problem of receiving
+# e-mails really latter, delay of greylisting has been set to
+# 180 seconds (default is 300 seconds).
 tools/editconf.py /etc/default/postgrey \
-	POSTGREY_OPTS=\"--inet=127.0.0.1:10023\"
+	POSTGREY_OPTS=\"'--inet=127.0.0.1:10023 --delay=180'\"
 
 # 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.
@@ -187,3 +192,4 @@ ufw_allow submission
 # Restart services
 
 restart_service postfix
+restart_service postgrey