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

move websocket to new 'proxmox_http' crate 

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-05-14 15:44:50 +02:00 committed by Dietmar Maurer
parent b32cf6a1e0
commit c474a66b41
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -53,10 +53,11 @@ percent-encoding = "2.1"
pin-utils = "0.1.0" pin-utils = "0.1.0"
pin-project = "1.0" pin-project = "1.0"
pathpatterns = "0.1.2" pathpatterns = "0.1.2"
proxmox = { version = "0.11.4", features = [ "sortable-macro", "api-macro", "websocket" ] } 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", "websocket" ] } #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 = [ "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"

3
debian/control vendored
View File

@ -42,9 +42,10 @@ Build-Depends: debhelper (>= 11),
librust-proxmox-0.11+api-macro-dev (>= 0.11.4-~~), librust-proxmox-0.11+api-macro-dev (>= 0.11.4-~~),
librust-proxmox-0.11+default-dev (>= 0.11.4-~~), librust-proxmox-0.11+default-dev (>= 0.11.4-~~),
librust-proxmox-0.11+sortable-macro-dev (>= 0.11.4-~~), librust-proxmox-0.11+sortable-macro-dev (>= 0.11.4-~~),
librust-proxmox-0.11+websocket-dev (>= 0.11.4-~~),
librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~), librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~),
librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~), librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~),
librust-proxmox-http-0.1+default-dev,
librust-proxmox-http-0.1+websocket-dev,
librust-pxar-0.10+default-dev (>= 0.10.1-~~), librust-pxar-0.10+default-dev (>= 0.10.1-~~),
librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~), librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~),
librust-regex-1+default-dev (>= 1.2-~~), librust-regex-1+default-dev (>= 1.2-~~),

2
src/api2/node.rs
View File

@ -17,7 +17,7 @@ use proxmox::api::{
api, schema::*, ApiHandler, ApiMethod, ApiResponseFuture, Permission, RpcEnvironment, api, schema::*, ApiHandler, ApiMethod, ApiResponseFuture, Permission, RpcEnvironment,
}; };
use proxmox::list_subdirs_api_method; use proxmox::list_subdirs_api_method;
use proxmox::tools::websocket::WebSocket; use proxmox_http::websocket::WebSocket;
use proxmox::{identity, sortable}; use proxmox::{identity, sortable};
use crate::api2::types::*; use crate::api2::types::*;