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

update proxmox-http dependency

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-05-17 11:29:24 +02:00
parent 8e8836d1ea
commit 1d781c5b20
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -57,7 +57,8 @@ proxmox = { version = "0.11.5", features = [ "sortable-macro", "api-macro" ] }
#proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] } #proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] }
#proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] } #proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] }
proxmox-fuse = "0.1.1" proxmox-fuse = "0.1.1"
proxmox-http = { version = "0.1.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] } proxmox-http = { version = "0.2.0", features = [ "client", "http-helpers", "websocket" ] }
#proxmox-http = { version = "0.2.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] }
pxar = { version = "0.10.1", features = [ "tokio-io" ] } pxar = { version = "0.10.1", features = [ "tokio-io" ] }
#pxar = { path = "../pxar", features = [ "tokio-io" ] } #pxar = { path = "../pxar", features = [ "tokio-io" ] }
regex = "1.2" regex = "1.2"

2
src/acme/client.rs
View File

@ -16,7 +16,7 @@ use proxmox_acme_rs::account::AccountData as AcmeAccountData;
use proxmox_acme_rs::order::{Order, OrderData}; use proxmox_acme_rs::order::{Order, OrderData};
use proxmox_acme_rs::Request as AcmeRequest; use proxmox_acme_rs::Request as AcmeRequest;
use proxmox_acme_rs::{Account, Authorization, Challenge, Directory, Error, ErrorResponse}; use proxmox_acme_rs::{Account, Authorization, Challenge, Directory, Error, ErrorResponse};
use proxmox_http::http::client::SimpleHttp; use proxmox_http::client::SimpleHttp;
use crate::api2::types::AcmeAccountName; use crate::api2::types::AcmeAccountName;
use crate::config::acme::account_path; use crate::config::acme::account_path;

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

@ -7,7 +7,7 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission};
use proxmox::api::router::{Router, SubdirMap}; use proxmox::api::router::{Router, SubdirMap};
use proxmox::tools::fs::{replace_file, CreateOptions}; use proxmox::tools::fs::{replace_file, CreateOptions};
use proxmox_http::http::ProxyConfig; use proxmox_http::ProxyConfig;
use crate::config::node; use crate::config::node;
use crate::server::WorkerTask; use crate::server::WorkerTask;

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

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

4
src/client/http_client.rs
View File

@ -20,8 +20,8 @@ use proxmox::{
tools::fs::{file_get_json, replace_file, CreateOptions}, tools::fs::{file_get_json, replace_file, CreateOptions},
}; };
use proxmox_http::http::client::HttpsConnector; use proxmox_http::client::HttpsConnector;
use proxmox_http::http::helpers::build_authority; use proxmox_http::uri::build_authority;
use super::pipe_to_stream::PipeToSendStream; use super::pipe_to_stream::PipeToSendStream;
use crate::api2::types::{Authid, Userid}; use crate::api2::types::{Authid, Userid};

2
src/config/node.rs
View File

@ -10,7 +10,7 @@ use proxmox::api::api;
use proxmox::api::schema::{ApiStringFormat, Updater}; use proxmox::api::schema::{ApiStringFormat, Updater};
use proxmox::tools::fs::{replace_file, CreateOptions}; use proxmox::tools::fs::{replace_file, CreateOptions};
use proxmox_http::http::ProxyConfig; use proxmox_http::ProxyConfig;
use crate::acme::AcmeClient; use crate::acme::AcmeClient;
use crate::api2::types::{ use crate::api2::types::{

2
src/tools.rs
View File

@ -18,7 +18,7 @@ use percent_encoding::{utf8_percent_encode, AsciiSet};
pub use proxmox::tools::fd::Fd; pub use proxmox::tools::fd::Fd;
use proxmox::tools::fs::{create_path, CreateOptions}; use proxmox::tools::fs::{create_path, CreateOptions};
use proxmox_http::http::{ use proxmox_http::{
client::SimpleHttp, client::SimpleHttp,
client::SimpleHttpOptions, client::SimpleHttpOptions,
ProxyConfig, ProxyConfig,

2
src/tools/subscription.rs
View File

@ -12,7 +12,7 @@ use crate::tools::{
pbs_simple_http, pbs_simple_http,
}; };
use proxmox::tools::fs::{replace_file, CreateOptions}; use proxmox::tools::fs::{replace_file, CreateOptions};
use proxmox_http::http::client::SimpleHttp; use proxmox_http::client::SimpleHttp;
/// How long the local key is valid for in between remote checks /// How long the local key is valid for in between remote checks
pub const MAX_LOCAL_KEY_AGE: i64 = 15 * 24 * 3600; pub const MAX_LOCAL_KEY_AGE: i64 = 15 * 24 * 3600;