From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 967961FF165 for ; Thu, 28 Aug 2025 23:22:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8946C16B03; Thu, 28 Aug 2025 23:22:12 +0200 (CEST) Message-ID: <6a260baa-8071-4505-8169-18fe3ad41f10@proxmox.com> Date: Thu, 28 Aug 2025 23:21:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Backup Server development discussion , Shannon Sterz References: <20250827142458.293270-1-s.sterz@proxmox.com> Content-Language: en-US, de-DE From: Thomas Lamprecht In-Reply-To: <20250827142458.293270-1-s.sterz@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756416092580 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-offline-mirror] mirror: add support for trixie repositories 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On 27/08/2025 16:25, Shannon Sterz wrote: > Signed-off-by: Shannon Sterz > --- > src/bin/proxmox-offline-mirror.rs | 99 +++++++++++++++++++++---------- > 1 file changed, 69 insertions(+), 30 deletions(-) > > @@ -353,6 +382,15 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er > > // TODO enterprise query for key! > let url = match (release, variant) { > + (Release::Trixie, ProxmoxVariant::Enterprise) => format!( > + "https://enterprise.proxmox.com/debian/{product} trixie {product}-enterprise" > + ), > + (Release::Trixie, ProxmoxVariant::NoSubscription) => format!( > + "http://download.proxmox.com/debian/{product} trixie {product}-no-subscription" > + ), > + (Release::Trixie, ProxmoxVariant::Test) => { > + format!("http://download.proxmox.com/debian/{product} trixie {product}test") Since trixie the test repo is also finally kebab-case, i.e. above needs to use "... trixie {product}-test" > + } > (Release::Bookworm, ProxmoxVariant::Enterprise) => format!( > "https://enterprise.proxmox.com/debian/{product} bookworm {product}-enterprise" > ), > @@ -390,6 +428,7 @@ fn action_add_mirror(config: &SectionConfigData) -> Result, Er > }; > > let key = match release { > + Release::Trixie => "/etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg", Only checking the diff not the full context, but should we use the relatively new common archive keyring in /usr here? > Release::Bookworm => "/etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg", > Release::Bullseye => "/etc/apt/trusted.gpg.d/proxmox-release-bullseye.gpg", > Release::Buster => "/etc/apt/trusted.gpg.d/proxmox-release-buster.gpg", _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel