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 6F0BC9F883 for ; Fri, 9 Jun 2023 12:50:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4C2472D76C for ; Fri, 9 Jun 2023 12:50:51 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Jun 2023 12:50:50 +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 4D75942B49 for ; Fri, 9 Jun 2023 12:50:50 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Fri, 9 Jun 2023 12:50:36 +0200 Message-Id: <20230609105036.381912-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230609105036.381912-1-s.sterz@proxmox.com> References: <20230609105036.381912-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.098 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, proxmox-offline-mirror.rs] Subject: [pbs-devel] [PATCH 2/2] add support for bookworm enterprise ceph repo X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jun 2023 10:50:51 -0000 the bookworm release of proxmox ve comes along with a new ceph enterprise repo. this commit adds support for this new repo for bookworm-based releases. --- src/bin/proxmox-offline-mirror.rs | 37 ++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/src/bin/proxmox-offline-mirror.rs b/src/bin/proxmox-offline-mirror.rs index 9dfde91..ab2e535 100644 --- a/src/bin/proxmox-offline-mirror.rs +++ b/src/bin/proxmox-offline-mirror.rs @@ -1,4 +1,5 @@ use std::fmt::Display; +use std::matches; use std::path::Path; use anyhow::{bail, format_err, Error}; @@ -270,8 +271,36 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er Some(releases.len() - 1), )?; - let components = - read_string_from_tty("Enter repository components", Some("main test"))?; + let (base_url, components) = if matches!(release, Release::Bookworm) { + let variants = &[ + (ProxmoxVariant::Enterprise, "Enterprise repository"), + (ProxmoxVariant::NoSubscription, "No-Subscription repository"), + (ProxmoxVariant::Test, "Test repository"), + ]; + + let variant = + read_selection_from_tty("Select repository variant", variants, Some(0))?; + + match variant { + ProxmoxVariant::Enterprise => ( + "https://enterprise.proxmox.com/debian/ceph", + "enterprise".to_string(), + ), + ProxmoxVariant::NoSubscription => ( + "http://download.proxmox.com/debian/ceph", + "no-subscription".to_string(), + ), + ProxmoxVariant::Test => ( + "http://download.proxmox.com/debian/ceph", + "test".to_string(), + ), + } + } else { + ( + "http://download.proxmox.com/debian/ceph", + read_string_from_tty("Enter repository components", Some("main test"))?, + ) + }; let key = match release { Release::Bookworm => "/etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg", @@ -287,9 +316,7 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er CephRelease::Quincy => "quincy", }; - let url = format!( - "http://download.proxmox.com/debian/ceph-{ceph_release} {release} {components}" - ); + let url = format!("{base_url}-{ceph_release} {release} {components}"); let suggested_id = format!("ceph_{ceph_release}_{release}"); (url, key.to_string(), suggested_id, SkipConfig::default()) -- 2.30.2