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

move sync.rs to pbs_config workspace

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-08 06:57:23 +02:00
parent 58bfa3b19c
commit a4e5a0fc9f
9 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ use proxmox::api::router::SubdirMap;
use proxmox::{list_subdirs_api_method, sortable};
use pbs_api_types::{DATASTORE_SCHEMA, JOB_ID_SCHEMA, Authid, SyncJobConfig, SyncJobStatus};
use pbs_config::sync;
use crate::{
api2::{
@ -19,7 +20,6 @@ use crate::{
},
config::{
cached_user_info::CachedUserInfo,
sync,
},
server::{
jobstate::{

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

@ -10,10 +10,10 @@ use pbs_api_types::{
REMOTE_ID_SCHEMA, REMOTE_PASSWORD_SCHEMA, Remote, RemoteConfig, RemoteConfigUpdater,
Authid, PROXMOX_CONFIG_DIGEST_SCHEMA, DataStoreListItem, SyncJobConfig,
};
use pbs_config::sync;
use crate::config::cached_user_info::CachedUserInfo;
use crate::config::acl::{PRIV_REMOTE_AUDIT, PRIV_REMOTE_MODIFY};
use crate::config::sync;
#[api(
input: {

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

@ -9,6 +9,7 @@ use pbs_api_types::{
SINGLE_LINE_COMMENT_SCHEMA, JOB_ID_SCHEMA, REMOTE_ID_SCHEMA, DATASTORE_SCHEMA,
REMOVE_VANISHED_BACKUPS_SCHEMA, SYNC_SCHEDULE_SCHEMA, PROXMOX_CONFIG_DIGEST_SCHEMA,
};
use pbs_config::sync;
use crate::config::acl::{
PRIV_DATASTORE_AUDIT,
@ -19,8 +20,7 @@ use crate::config::acl::{
PRIV_REMOTE_READ,
};
use crate::config::{sync, cached_user_info::CachedUserInfo};
use pbs_config::open_backup_lockfile;
use crate::config::cached_user_info::CachedUserInfo;
pub fn check_sync_job_read_access(
user_info: &CachedUserInfo,
@ -155,7 +155,7 @@ pub fn create_sync_job(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let _lock = open_backup_lockfile(sync::SYNC_CFG_LOCKFILE, None, true)?;
let _lock = sync::lock_config()?;
let sync_job: SyncJobConfig = serde_json::from_value(param)?;
if !check_sync_job_modify_access(&user_info, &auth_id, &sync_job) {
@ -299,7 +299,7 @@ pub fn update_sync_job(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let _lock = open_backup_lockfile(sync::SYNC_CFG_LOCKFILE, None, true)?;
let _lock = sync::lock_config()?;
// pass/compare digest
let (mut config, expected_digest) = sync::config()?;
@ -382,7 +382,7 @@ pub fn delete_sync_job(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let _lock = open_backup_lockfile(sync::SYNC_CFG_LOCKFILE, None, true)?;
let _lock = sync::lock_config()?;
let (mut config, expected_digest) = sync::config()?;