tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move ProxyConfig to proxmox_http

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-05-14 15:44:54 +02:00
committed by Dietmar Maurer
parent 3ed7e87538
commit 4229633d98
5 changed files with 10 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api2/node/apt.rs
View File

@ -7,9 +7,11 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission};
use proxmox::api::router::{Router, SubdirMap};
use proxmox::tools::fs::{replace_file, CreateOptions};
use proxmox_http::http::ProxyConfig;
use crate::config::node;
use crate::server::WorkerTask;
use crate::tools::{apt, SimpleHttp, http::ProxyConfig, subscription};
use crate::tools::{apt, SimpleHttp, subscription};
use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY};
use crate::api2::types::{Authid, APTUpdateInfo, NODE_SCHEMA, UPID_SCHEMA};

2
src/api2/types/mod.rs
View File

@ -1660,7 +1660,7 @@ pub struct NodeStatus {
pub const HTTP_PROXY_SCHEMA: Schema = StringSchema::new(
"HTTP proxy configuration [http://]<host>[:port]")
.format(&ApiStringFormat::VerifyFn(|s| {
crate::tools::http::ProxyConfig::parse_proxy_url(s)?;
proxmox_http::http::ProxyConfig::parse_proxy_url(s)?;
Ok(())
}))
.min_length(1)