start new pbs-config workspace

moved src/config/domains.rs

src/api2/access/acl.rs

@@ -8,7 +8,7 @@ use crate::api2::types::*;
 use crate::config::acl;
 use crate::config::acl::{Role, PRIV_SYS_AUDIT, PRIV_PERMISSIONS_MODIFY};
 use crate::config::cached_user_info::CachedUserInfo;
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 fn extract_acl_node_data(
     node: &acl::AclTreeNode,

src/api2/access/domain.rs

@@ -7,8 +7,7 @@ use serde_json::{json, Value};
 
 use proxmox::api::{api, Permission, Router, RpcEnvironment};
 
-use crate::config;
-use crate::api2::types::*;
+use pbs_api_types::{REALM_ID_SCHEMA, SINGLE_LINE_COMMENT_SCHEMA};
 
 #[api]
 #[derive(Deserialize, Serialize, PartialEq, Eq)]
@@ -81,7 +80,7 @@ fn list_domains(mut rpcenv: &mut dyn RpcEnvironment) -> Result<Vec<BasicRealmInf
         "comment": "Proxmox Backup authentication server",
     }))?);
 
-    let (config, digest) = config::domains::config()?;
+    let (config, digest) = pbs_config::domains::config()?;
 
     for (_, (section_type, v)) in config.sections.iter() {
         let mut entry = v.clone();

src/api2/access/openid.rs

@@ -15,13 +15,13 @@ use proxmox_openid::{OpenIdAuthenticator,  OpenIdConfig};
 use pbs_buildcfg::PROXMOX_BACKUP_RUN_DIR_M;
 use pbs_tools::auth::private_auth_key;
 use pbs_tools::ticket::Ticket;
+use pbs_config::domains::{OpenIdUserAttribute, OpenIdRealmConfig};
 
 use crate::server::ticket::ApiTicket;
 
-use crate::config::domains::{OpenIdUserAttribute, OpenIdRealmConfig};
 use crate::config::cached_user_info::CachedUserInfo;
 
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 use crate::api2::types::*;
 use crate::auth_helpers::*;
@@ -88,7 +88,7 @@ pub fn openid_login(
     let (realm, private_auth_state) =
         OpenIdAuthenticator::verify_public_auth_state(PROXMOX_BACKUP_RUN_DIR_M!(), &state)?;
 
-    let (domains, _digest) = crate::config::domains::config()?;
+    let (domains, _digest) = pbs_config::domains::config()?;
     let config: OpenIdRealmConfig = domains.lookup("openid", &realm)?;
 
     let open_id = openid_authenticator(&config, &redirect_url)?;
@@ -182,7 +182,7 @@ fn openid_auth_url(
     _rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<String, Error> {
 
-    let (domains, _digest) = crate::config::domains::config()?;
+    let (domains, _digest) = pbs_config::domains::config()?;
     let config: OpenIdRealmConfig = domains.lookup("openid", &realm)?;
 
     let open_id = openid_authenticator(&config, &redirect_url)?;

src/api2/access/user.rs

@@ -18,7 +18,7 @@ use crate::config::user;
 use crate::config::token_shadow;
 use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_PERMISSIONS_MODIFY};
 use crate::config::cached_user_info::CachedUserInfo;
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 pub const PBS_PASSWORD_SCHEMA: Schema = StringSchema::new("User Password.")
     .format(&PASSWORD_FORMAT)

src/api2/config/access/openid.rs

@@ -6,7 +6,7 @@ use ::serde::{Deserialize, Serialize};
 
 use proxmox::api::{api, Permission, Router, RpcEnvironment};
 
-use crate::config::domains::{self, OpenIdRealmConfig, OpenIdRealmConfigUpdater};
+use pbs_config::domains::{self, OpenIdRealmConfig, OpenIdRealmConfigUpdater};
 use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_REALM_ALLOCATE};
 use crate::api2::types::*;
 

src/api2/config/datastore.rs

@@ -10,6 +10,7 @@ use proxmox::api::schema::{ApiType, parse_property_string};
 
 use pbs_datastore::chunk_store::ChunkStore;
 use pbs_datastore::task::TaskState;
+use pbs_config::BackupLockGuard;
 
 use crate::api2::config::sync::delete_sync_job;
 use crate::api2::config::verify::delete_verification_job;
@@ -19,7 +20,6 @@ use crate::api2::admin::{
     verify::list_verification_jobs,
 };
 use crate::api2::types::*;
-use crate::backup::BackupLockGuard;
 use crate::config::cached_user_info::CachedUserInfo;
 use crate::config::datastore::{self, DataStoreConfig, DataStoreConfigUpdater};
 use crate::config::acl::{PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY};
@@ -68,7 +68,7 @@ pub(crate) fn do_create_datastore(
 ) -> Result<(), Error> {
     let path: PathBuf = datastore.path.clone().into();
 
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let _store = ChunkStore::create(&datastore.name, path, backup_user.uid, backup_user.gid, worker)?;
 
     config.set_data(&datastore.name, "datastore", &datastore)?;

src/api2/config/remote.rs

@@ -11,7 +11,7 @@ use crate::api2::types::*;
 use crate::config::cached_user_info::CachedUserInfo;
 use crate::config::remote;
 use crate::config::acl::{PRIV_REMOTE_AUDIT, PRIV_REMOTE_MODIFY};
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 #[api(
     input: {

src/api2/config/sync.rs

@@ -17,7 +17,7 @@ use crate::config::acl::{
 
 use crate::config::cached_user_info::CachedUserInfo;
 use crate::config::sync::{self, SyncJobConfig};
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 pub fn check_sync_job_read_access(
     user_info: &CachedUserInfo,

src/api2/config/tape_backup_job.rs

@@ -3,6 +3,7 @@ use serde_json::Value;
 use ::serde::{Deserialize, Serialize};
 
 use proxmox::api::{api, Router, RpcEnvironment, Permission};
+use pbs_config::open_backup_lockfile;
 
 use crate::{
     api2::types::{
@@ -16,7 +17,6 @@ use crate::{
         MEDIA_POOL_NAME_SCHEMA,
         SYNC_SCHEDULE_SCHEMA,
     },
-    backup::open_backup_lockfile,
     config::{
         self,
         cached_user_info::CachedUserInfo,

src/api2/config/tape_encryption_keys.rs

@@ -14,6 +14,7 @@ use proxmox::{
 use pbs_api_types::Fingerprint;
 use pbs_datastore::{KeyInfo, Kdf};
 use pbs_datastore::key_derivation::KeyConfig;
+use pbs_config::open_backup_lockfile;
 
 use crate::{
     config::{
@@ -35,7 +36,6 @@ use crate::{
         PROXMOX_CONFIG_DIGEST_SCHEMA,
         PASSWORD_HINT_SCHEMA,
     },
-    backup::open_backup_lockfile,
 };
 
 #[api(

src/api2/config/verify.rs

@@ -13,7 +13,7 @@ use crate::config::acl::{
 
 use crate::config::cached_user_info::CachedUserInfo;
 use crate::config::verify::{self, VerificationJobConfig};
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 #[api(
     input: {

src/api2/node/disks/directory.rs

@@ -17,7 +17,7 @@ use crate::server::WorkerTask;
 
 use crate::api2::types::*;
 use crate::config::datastore::{self, DataStoreConfig};
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 #[api(
     properties: {

src/api2/node/network.rs

@@ -9,7 +9,7 @@ use crate::config::network::{self, NetworkConfig};
 use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY};
 use crate::api2::types::*;
 use crate::server::{WorkerTask};
-use crate::backup::open_backup_lockfile;
+use pbs_config::open_backup_lockfile;
 
 fn split_interface_list(list: &str) -> Result<Vec<String>, Error> {
     let value = parse_property_string(&list, &NETWORK_INTERFACE_ARRAY_SCHEMA)?;

src/api2/types/mod.rs

@@ -331,12 +331,6 @@ pub const BLOCKDEVICE_NAME_SCHEMA: Schema = StringSchema::new("Block device name
     .max_length(64)
     .schema();
 
-pub const REALM_ID_SCHEMA: Schema = StringSchema::new("Realm name.")
-    .format(&PROXMOX_SAFE_ID_FORMAT)
-    .min_length(2)
-    .max_length(32)
-    .schema();
-
 // Complex type definitions
 
 #[api(