From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B59726B303 for ; Mon, 20 Sep 2021 11:13:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC6291E3C7 for ; Mon, 20 Sep 2021 11:13:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C7CA11E3AD for ; Mon, 20 Sep 2021 11:13:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A0AF9449A6; Mon, 20 Sep 2021 11:13:44 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Mon, 20 Sep 2021 11:13:29 +0200 Message-Id: <20210920091340.3251578-4-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210920091340.3251578-1-dietmar@proxmox.com> References: <20210920091340.3251578-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.638 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup rebase 04/15] move src/server/environment.rs to pbs-server crate X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 09:13:45 -0000 --- {src/server => pbs-server/src}/environment.rs | 0 pbs-server/src/lib.rs | 3 +++ src/server/mod.rs | 3 --- src/server/rest.rs | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) rename {src/server => pbs-server/src}/environment.rs (100%) diff --git a/src/server/environment.rs b/pbs-server/src/environment.rs similarity index 100% rename from src/server/environment.rs rename to pbs-server/src/environment.rs diff --git a/pbs-server/src/lib.rs b/pbs-server/src/lib.rs index 21a91115..42e78d89 100644 --- a/pbs-server/src/lib.rs +++ b/pbs-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 2377f267..71db76af 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 84053902..1b95ce04 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 pbs_server::{ApiConfig, FileLogger, FileLogOptions, AuthError}; +use pbs_server::{ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment}; -use super::environment::RestEnvironment; use super::formatter::*; use crate::auth_helpers::*; -- 2.30.2