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 59A7971F5E for ; Wed, 30 Jun 2021 18:40:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 57DFD1C171 for ; Wed, 30 Jun 2021 18:40:10 +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 id 1B1EC1C15A for ; Wed, 30 Jun 2021 18:40:09 +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 E4A6F41BEE for ; Wed, 30 Jun 2021 18:40:08 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 30 Jun 2021 18:39:54 +0200 Message-Id: <20210630163955.18639-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210630163955.18639-1-s.ivanov@proxmox.com> References: <20210630163955.18639-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.567 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [utils.pm] Subject: [pmg-devel] [PATCH pmg-api 1/2] utils: fix service_aliases usage 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: Wed, 30 Jun 2021 16:40:10 -0000 2 errors were introduced in 4f06ff8ac21baa5736060221191fb109e20d8e37: * a typo in the postgresql service name * it missed the other uses of the service_name hash, apart from the lookup_real_service_name sub. both fixed here Reported-by: Martin Maurer Signed-off-by: Stoiko Ivanov --- src/PMG/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index 318c7b3..09999d8 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -717,7 +717,7 @@ sub lookup_real_service_name { if ($alias eq 'postgres') { my $pg_ver = get_pg_server_version(); - return "postgresl\@${pg_ver}-main"; + return "postgresql\@${pg_ver}-main"; } return $service_aliases->{$alias} // $alias; @@ -735,7 +735,7 @@ sub get_full_service_state { } }; - $service = $service_aliases->{$service} // $service; + $service = lookup_real_service_name($service); PVE::Tools::run_command(['systemctl', 'show', $service], outfunc => $parser); return $res; @@ -790,7 +790,7 @@ sub service_cmd { $cmd = 'restart' if $cmd eq 'start'; } - $service = $service_aliases->{$service} // $service; + $service = lookup_real_service_name($service); PVE::Tools::run_command(['systemctl', $cmd, $service]); }; -- 2.20.1