From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 465FFB556 for ; Mon, 11 Sep 2023 16:23:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2AAD99D38 for ; Mon, 11 Sep 2023 16:23:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 11 Sep 2023 16:23:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 21844447E1 for ; Mon, 11 Sep 2023 16:23:42 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 11 Sep 2023 16:23:15 +0200 Message-Id: <20230911142317.19746-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230911142317.19746-1-s.ivanov@proxmox.com> References: <20230911142317.19746-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 3/4] config: postfix: make smtp-filter-timeout configurable X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2023 14:23:44 -0000 Signed-off-by: Stoiko Ivanov --- This patch needs the changes for pmg-docs (actually an updated pmg-doc-generator package installed) applied. src/PMG/Config.pm | 6 ++++++ src/templates/main.cf.in | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 7339e0d..eb6c5c2 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -699,6 +699,11 @@ sub properties { type => 'boolean', default => 1 }, + filter_timeout => { + description => "Timeout for the processing of one mail (in seconds) (postfix option `smtpd_proxy_timeout` and `lmtp_data_done_timeout`)", + type => 'integer', + default => 600 + }, }; } @@ -740,6 +745,7 @@ sub options { before_queue_filtering => { optional => 1 }, ndr_on_block => { optional => 1 }, smtputf8 => { optional => 1 }, + filter_timeout => { optional => 1 }, }; } diff --git a/src/templates/main.cf.in b/src/templates/main.cf.in index 516bc2f..764f9a3 100644 --- a/src/templates/main.cf.in +++ b/src/templates/main.cf.in @@ -50,9 +50,10 @@ default_transport = smtp:[% pmg.mail.smarthost %]:[% pmg.mail.smarthostport %] [% END %] [% IF pmg.mail.before_queue_filtering -%] -smtpd_proxy_timeout = 600s +smtpd_proxy_timeout = [% pmg.mail.filter_timeout %]s [% ELSE %] content_filter=scan:127.0.0.1:10024 +lmtp_data_done_timeout = [% pmg.mail.filter_timeout %]s [%- END %] mail_name = Proxmox -- 2.39.2