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 69A381FF13F for ; Thu, 12 Mar 2026 12:42:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A049A12415; Thu, 12 Mar 2026 12:42:53 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 1/6] pbs-config: use http proxy schema moved to proxmox-http crate Date: Thu, 12 Mar 2026 12:42:03 +0100 Message-ID: <20260312114208.514373-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312114208.514373-1-c.ebner@proxmox.com> References: <20260312114208.514373-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: 1773315703759 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 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_MSPIKE_H2 0.001 Average reputation (+2) 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: DGBKC44QXEORF7HCOCAIBZWISWBIK4CB X-Message-ID-Hash: DGBKC44QXEORF7HCOCAIBZWISWBIK4CB 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: The schema was move there in preparation for moving the node config to the pbs-config crate. Use it and drop the local one. Signed-off-by: Christian Ebner --- Cargo.toml | 2 +- src/api2/types/mod.rs | 11 ----------- src/config/node.rs | 4 +--- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ca0ee1761..542257535 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ proxmox-config-digest = "1" proxmox-daemon = "1" proxmox-fuse = "3" proxmox-docgen = "1" -proxmox-http = { version = "1.0.2", features = [ "client", "http-helpers", "websocket" ] } # see below +proxmox-http = { version = "1.0.2", features = [ "client", "http-helpers", "api-types", "websocket" ] } # see below proxmox-human-byte = "1" proxmox-io = "1.0.1" # tools and client use "tokio" feature proxmox-lang = "1.1" diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs index 341936853..40fe7302b 100644 --- a/src/api2/types/mod.rs +++ b/src/api2/types/mod.rs @@ -116,14 +116,3 @@ fn test_proxmox_user_id_schema() -> Result<(), anyhow::Error> { Ok(()) } - -pub const HTTP_PROXY_SCHEMA: Schema = - StringSchema::new("HTTP proxy configuration [http://][:port]") - .format(&ApiStringFormat::VerifyFn(|s| { - proxmox_http::ProxyConfig::parse_proxy_url(s)?; - Ok(()) - })) - .min_length(1) - .max_length(128) - .type_text("[http://][:port]") - .schema(); diff --git a/src/config/node.rs b/src/config/node.rs index a79bf5707..c01c6aa7a 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -9,14 +9,12 @@ use pbs_api_types::{ OPENSSL_CIPHERS_TLS_1_3_SCHEMA, }; use proxmox_acme_api::{AcmeConfig, AcmeDomain, ACME_DOMAIN_PROPERTY_SCHEMA}; -use proxmox_http::ProxyConfig; +use proxmox_http::{ProxyConfig, HTTP_PROXY_SCHEMA}; use proxmox_schema::{api, ApiStringFormat, ApiType, Updater}; use pbs_buildcfg::configdir; use pbs_config::{open_backup_lockfile, BackupLockGuard}; -use crate::api2::types::HTTP_PROXY_SCHEMA; - const CONF_FILE: &str = configdir!("/node.cfg"); const LOCK_FILE: &str = configdir!("/.node.lck"); -- 2.47.3