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 B95956BD9D for ; Thu, 18 Mar 2021 16:15:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B76CE1B27E for ; Thu, 18 Mar 2021 16:15:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 3CE3E1B263 for ; Thu, 18 Mar 2021 16:15:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F164546364 for ; Thu, 18 Mar 2021 16:15:18 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Thu, 18 Mar 2021 16:14:49 +0100 Message-Id: <20210318151449.18638-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210318151449.18638-1-s.ivanov@proxmox.com> References: <20210318151449.18638-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [certificates.pm] Subject: [pmg-devel] [PATCH pmg-api 4/4] certs: reload postfix to activate new certificate 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: Thu, 18 Mar 2021 15:15:20 -0000 the current logic for reloading postfix only does so if the tls config parameter changes (after rewriting the config files). this does not cover the case where a certificate is replaced in a setup, which already has tls enabled (config stays the same, so postfix does not get reloaded) the issue is mostly cosmetic, since postfix does eventually fork off new smtpd instances, which read the files from disk, but it's inconvenient, when trying out the new acme integration, and then running a ssl-check on your PMG from external just to see that the certificate was not updated. Signed-off-by: Stoiko Ivanov --- best viewed with `git show -w` src/PMG/API2/Certificates.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm index 1a6c434..1a7ded6 100644 --- a/src/PMG/API2/Certificates.pm +++ b/src/PMG/API2/Certificates.pm @@ -69,16 +69,14 @@ my sub set_smtp : prototype($$) { my $code = sub { my $cfg = PMG::Config->new(); - if (!$cfg->get('mail', 'tls') == !$on) { - return; + if (!$cfg->get('mail', 'tls') != !$on) { + print "Rewriting postfix config\n"; + $cfg->set('mail', 'tls', $on); + $cfg->write(); + my $changed = $cfg->rewrite_config_postfix(); } - print "Rewriting postfix config\n"; - $cfg->set('mail', 'tls', $on); - $cfg->write(); - my $changed = $cfg->rewrite_config_postfix(); - - if ($changed && $reload) { + if ($reload) { print "Reloading postfix\n"; PMG::Utils::service_cmd('postfix', 'reload'); } -- 2.20.1