From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7FB481FF13B for ; Wed, 11 Mar 2026 10:59:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6723114014; Wed, 11 Mar 2026 10:59:30 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 2/4] tools: factor out node proxy config read helper Date: Wed, 11 Mar 2026 10:59:04 +0100 Message-ID: <20260311095906.202410-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311095906.202410-1-c.ebner@proxmox.com> References: <20260311095906.202410-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773223128500 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 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 Message-ID-Hash: PG2QLTHA5WLMLKHNSVIVGV3YGUSNO3MT X-Message-ID-Hash: PG2QLTHA5WLMLKHNSVIVGV3YGUSNO3MT X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Will be reused for getting the node proxy config to set it for the s3-client as well. No functional changes. Signed-off-by: Christian Ebner --- src/api2/node/apt.rs | 8 +------- src/tools/mod.rs | 11 +++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index c696adb1e..dd92e9f48 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -15,8 +15,6 @@ use proxmox_sys::fs::{replace_file, CreateOptions}; use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA}; -use crate::config::node; - #[api( input: { properties: { @@ -59,11 +57,7 @@ pub fn update_apt_proxy_config(proxy_config: Option<&ProxyConfig>) -> Result<(), } fn read_and_update_proxy_config() -> Result, Error> { - let proxy_config = if let Ok((node_config, _digest)) = node::config() { - node_config.http_proxy() - } else { - None - }; + let proxy_config = crate::tools::node_proxy_config(); update_apt_proxy_config(proxy_config.as_ref())?; Ok(proxy_config) diff --git a/src/tools/mod.rs b/src/tools/mod.rs index 6a975bde2..93b4d8ea4 100644 --- a/src/tools/mod.rs +++ b/src/tools/mod.rs @@ -13,6 +13,8 @@ use proxmox_http::{client::Client, HttpOptions, ProxyConfig}; use pbs_datastore::backup_info::{BackupDir, BackupInfo}; use pbs_datastore::manifest::BackupManifest; +use crate::config::node; + pub mod config; pub mod disks; pub mod fs; @@ -186,3 +188,12 @@ pub(crate) fn backup_info_to_snapshot_list_item( } } } + +/// Read the nodes http proxy config from the node config. +pub(super) fn node_proxy_config() -> Option { + if let Ok((node_config, _digest)) = node::config() { + node_config.http_proxy() + } else { + None + } +} -- 2.47.3