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

move user configuration to pbs_config workspace

Browse Source 
Also moved memcom.rs and cached_user_info.rs
This commit is contained in:
Dietmar Maurer
2021-09-10 06:53:53 +02:00
parent b65dfff574
commit ba3d7e19fb
42 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ use pbs_api_types::{
PROXMOX_CONFIG_DIGEST_SCHEMA, CHANGER_NAME_SCHEMA, SLOT_ARRAY_SCHEMA,
PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
};
use pbs_config::CachedUserInfo;
use crate::{
config::cached_user_info::CachedUserInfo,
tape::{
linux_tape_changer_list,
check_drive_path,

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

@ -24,7 +24,7 @@ use crate::api2::admin::{
sync::list_sync_jobs,
verify::list_verification_jobs,
};
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
use crate::config::datastore::{self, DataStoreConfig, DataStoreConfigUpdater};
use crate::server::{jobstate, WorkerTask};

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

@ -8,9 +8,9 @@ use pbs_api_types::{
Authid, LtoTapeDrive, LtoTapeDriveUpdater, ScsiTapeChanger,
PROXMOX_CONFIG_DIGEST_SCHEMA, DRIVE_NAME_SCHEMA, PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
};
use pbs_config::CachedUserInfo;
use crate::{
config::cached_user_info::CachedUserInfo,
tape::{
lto_tape_device_list,
check_drive_path,

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

@ -15,7 +15,7 @@ use pbs_api_types::{
PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
};
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
#[api(
protected: true,

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

@ -13,7 +13,7 @@ use pbs_api_types::{
};
use pbs_config::sync;
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
#[api(
input: {

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

@ -11,7 +11,7 @@ use pbs_api_types::{
};
use pbs_config::sync;
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
pub fn check_sync_job_read_access(
user_info: &CachedUserInfo,
@ -356,7 +356,7 @@ pub const ROUTER: Router = Router::new()
#[test]
fn sync_job_access_test() -> Result<(), Error> {
let (user_cfg, _) = crate::config::user::test_cfg_from_str(r###"
let (user_cfg, _) = pbs_config::user::test_cfg_from_str(r###"
user: noperm@pbs
user: read@pbs

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

@ -10,7 +10,7 @@ use pbs_api_types::{
PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
};
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
#[api(
input: {

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

@ -10,7 +10,7 @@ use pbs_api_types::{
};
use pbs_config::verify;
use crate::config::cached_user_info::CachedUserInfo;
use pbs_config::CachedUserInfo;
#[api(
input: {