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 AB1339D262 for ; Wed, 25 Oct 2023 15:34:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 942D7149A4 for ; Wed, 25 Oct 2023 15:34:40 +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 ; Wed, 25 Oct 2023 15:34:39 +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 9506445F2A for ; Wed, 25 Oct 2023 15:34:39 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 25 Oct 2023 15:34:35 +0200 Message-Id: <20231025133435.3217455-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subscription.pm, proxmox.com] Subject: [pve-devel] [PATCH manager] subscription: remove ceph APT auth if invalid X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2023 13:34:40 -0000 like we do for the main APT auth file(s) in proxmox-subscription. Signed-off-by: Fabian Grünbichler --- PVE/API2/Subscription.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Subscription.pm b/PVE/API2/Subscription.pm index 7c1e300ba..836e7a86f 100644 --- a/PVE/API2/Subscription.pm +++ b/PVE/API2/Subscription.pm @@ -94,14 +94,18 @@ sub write_etc_subscription { Proxmox::RS::Subscription::write_subscription( $filename, "/etc/apt/auth.conf.d/pve.conf", "enterprise.proxmox.com/debian/pve", $info); - # FIXME: improve this, especially the selection of valid ceph-releases - # NOTE: currently we should add future ceph releases as early as possible, to ensure that - my $ceph_auth = ''; - for my $ceph_release ('quincy', 'reef') { - $ceph_auth .= "machine enterprise.proxmox.com/debian/ceph-${ceph_release}" + if (!(defined($info->{key}) && defined($info->{serverid}))) { + unlink "/etc/apt/auth.conf.d/ceph.conf"; + } else { + # FIXME: improve this, especially the selection of valid ceph-releases + # NOTE: currently we should add future ceph releases as early as possible, to ensure that + my $ceph_auth = ''; + for my $ceph_release ('quincy', 'reef') { + $ceph_auth .= "machine enterprise.proxmox.com/debian/ceph-${ceph_release}" ." login $info->{key} password $info->{serverid}\n" + } + PVE::Tools::file_set_contents("/etc/apt/auth.conf.d/ceph.conf", $ceph_auth); } - PVE::Tools::file_set_contents("/etc/apt/auth.conf.d/ceph.conf", $ceph_auth); } __PACKAGE__->register_method ({ -- 2.39.2