summaryrefslogtreecommitdiffstats
path: root/roles/common/files/etc
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-07-04 23:06:41 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:52:30 +0200
commit85e90fece41e0dadb19087a44c4eec8b76c9d5dd (patch)
treee769ad22ac00949d64163b8c8e55683e0338f01f /roles/common/files/etc
parent379a4b157c50645bdc7bb134b245bdd6e4938061 (diff)
Increase the timeout in the smtpd waiting for the reinjection from amavis.
SMTP client connection caching was introduced in 2.6.0: the SMTP session is held for the next task (in adaptative mode, only when there was a delay of only 5s between the two previous mails), but Postfix will terminate it if the next mail doesn't come soon enough, or if amavis does't terminate it itself (usually after 15s).
Diffstat (limited to 'roles/common/files/etc')
-rw-r--r--roles/common/files/etc/postfix/master.cf1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/common/files/etc/postfix/master.cf b/roles/common/files/etc/postfix/master.cf
index 02e1658..8ba9f0f 100644
--- a/roles/common/files/etc/postfix/master.cf
+++ b/roles/common/files/etc/postfix/master.cf
@@ -57,6 +57,7 @@ amavisfeed unix - - n - 5 lmtp
# same machine, we need to create another entry, on another port.)
127.0.0.1:10025 inet n - n - - smtpd
-o content_filter=
+ -o smtpd_timeout=${stress?30}${stress:300}s
-o smtpd_delay_reject=no
-o smtpd_client_restrictions=permit_mynetworks,reject
-o smtpd_helo_restrictions=