From e57e1cd82d85b31166e6dfe3eb2398072b84defa Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 22 Nov 2019 09:23:03 +0100
Subject: [PATCH] move src/api_schema/config.rs -> src/server/config.rs

---
 src/api_schema.rs                    | 1 -
 src/bin/proxmox-backup-api.rs        | 4 ++--
 src/bin/proxmox-backup-proxy.rs      | 3 +--
 src/server.rs                        | 3 +++
 src/{api_schema => server}/config.rs | 0
 src/server/rest.rs                   | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename src/{api_schema => server}/config.rs (100%)

diff --git a/src/api_schema.rs b/src/api_schema.rs
index 27ef3194..8069fd09 100644
--- a/src/api_schema.rs
+++ b/src/api_schema.rs
@@ -8,5 +8,4 @@
 //! hierarchy of API entries, and provides ways to find an API
 //! definition by path.
 
-pub mod config;
 pub mod format;
diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
index bcaa2122..64ca7c42 100644
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -5,7 +5,7 @@ use proxmox::tools::try_block;
 use proxmox::api::RpcEnvironmentType;
 
 //use proxmox_backup::tools;
-use proxmox_backup::api_schema::config::*;
+//use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
@@ -43,7 +43,7 @@ async fn run() -> Result<(), Error> {
     }
     let _ = csrf_secret(); // load with lazy_static
 
-    let config = ApiConfig::new(
+    let config = server::ApiConfig::new(
         buildcfg::JS_DIR, &proxmox_backup::api2::ROUTER, RpcEnvironmentType::PRIVILEGED);
  
     let rest_server = RestServer::new(config);
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index f7d346bc..b6e23883 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -12,8 +12,7 @@ use proxmox_backup::configdir;
 use proxmox_backup::buildcfg;
 use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
-use proxmox_backup::api_schema::config::*;
-use proxmox_backup::server::rest::*;
+use proxmox_backup::server::{ApiConfig, rest::*};
 use proxmox_backup::auth_helpers::*;
 
 #[tokio::main]
diff --git a/src/server.rs b/src/server.rs
index 21c0885a..2712e929 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -22,6 +22,9 @@ pub use worker_task::*;
 mod h2service;
 pub use h2service::*;
 
+pub mod config;
+pub use config::*;
+
 pub mod formatter;
 
 #[macro_use]
diff --git a/src/api_schema/config.rs b/src/server/config.rs
similarity index 100%
rename from src/api_schema/config.rs
rename to src/server/config.rs
diff --git a/src/server/rest.rs b/src/server/rest.rs
index 55e010b6..36a4117e 100644
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -23,8 +23,9 @@ use proxmox::api::schema::{parse_simple_value, verify_json_object, parse_paramet
 
 use super::environment::RestEnvironment;
 use super::formatter::*;
+use super::ApiConfig;
+
 use crate::auth_helpers::*;
-use crate::api_schema::config::ApiConfig;
 use crate::tools;
 
 extern "C"  { fn tzset(); }