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

start new pbs-config workspace

Browse Source 
moved src/config/domains.rs
This commit is contained in:
Dietmar Maurer
2021-09-02 12:47:11 +02:00
parent df12c9ec4e
commit 2121174827
58 changed files with 207 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api2/config/access/openid.rs
View File

@ -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::*;

4
src/api2/config/datastore.rs
View File

@ -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)?;

2
src/api2/config/remote.rs
View File

@ -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: {

2
src/api2/config/sync.rs
View File

@ -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,

2
src/api2/config/tape_backup_job.rs
View File

@ -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,

2
src/api2/config/tape_encryption_keys.rs
View File

@ -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(

2
src/api2/config/verify.rs
View File

@ -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: {