diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-07-04 23:06:41 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:52:30 +0200 |
| commit | 85e90fece41e0dadb19087a44c4eec8b76c9d5dd (patch) | |
| tree | e769ad22ac00949d64163b8c8e55683e0338f01f | |
| parent | 379a4b157c50645bdc7bb134b245bdd6e4938061 (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).
| -rw-r--r-- | roles/IMAP/templates/etc/postfix/main.cf.j2 | 2 | ||||
| -rw-r--r-- | roles/common/files/etc/postfix/master.cf | 1 | ||||
| -rw-r--r-- | roles/lists/templates/etc/postfix/main.cf.j2 | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/roles/IMAP/templates/etc/postfix/main.cf.j2 b/roles/IMAP/templates/etc/postfix/main.cf.j2 index 1f1f990..5758146 100644 --- a/roles/IMAP/templates/etc/postfix/main.cf.j2 +++ b/roles/IMAP/templates/etc/postfix/main.cf.j2 @@ -59,8 +59,6 @@ recipient_canonical_maps = pcre:$config_directory/recipient_canonical.pcre # Don't rewrite remote headers local_header_rewrite_clients = -# Tolerate occasional high latency -smtpd_timeout = 1200s relay_clientcerts = cdb:$config_directory/relay_clientcerts 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= diff --git a/roles/lists/templates/etc/postfix/main.cf.j2 b/roles/lists/templates/etc/postfix/main.cf.j2 index 9859ac1..da68a42 100644 --- a/roles/lists/templates/etc/postfix/main.cf.j2 +++ b/roles/lists/templates/etc/postfix/main.cf.j2 @@ -64,7 +64,6 @@ local_header_rewrite_clients = smtp_destination_recipient_limit = 1000 # Tolerate occasional high latency smtp_data_done_timeout = 1200s -smtpd_timeout = 1200s # Forward everything to our internal outgoing proxy |