diff --git a/src/server/environment.rs b/proxmox-rest-server/src/environment.rs similarity index 100% rename from src/server/environment.rs rename to proxmox-rest-server/src/environment.rs diff --git a/proxmox-rest-server/src/lib.rs b/proxmox-rest-server/src/lib.rs index 21a91115..42e78d89 100644 --- a/proxmox-rest-server/src/lib.rs +++ b/proxmox-rest-server/src/lib.rs @@ -6,6 +6,9 @@ use proxmox::tools::fd::Fd; pub mod daemon; +mod environment; +pub use environment::*; + mod state; pub use state::*; diff --git a/src/server/mod.rs b/src/server/mod.rs index 69cfe7b0..c426383f 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -46,9 +46,6 @@ pub fn our_ctrl_sock() -> String { ctrl_sock_from_pid(*PID) } -mod environment; -pub use environment::*; - mod upid; pub use upid::*; diff --git a/src/server/rest.rs b/src/server/rest.rs index 0c4df906..6af6fa55 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -34,9 +34,8 @@ use proxmox::tools::fs::CreateOptions; use pbs_tools::compression::{DeflateEncoder, Level}; use pbs_tools::stream::AsyncReaderStream; use pbs_api_types::{Authid, Userid}; -use proxmox_rest_server::{ApiConfig, FileLogger, FileLogOptions, AuthError}; +use proxmox_rest_server::{ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment}; -use super::environment::RestEnvironment; use super::formatter::*; use crate::auth_helpers::*;