start new pbs-config workspace

moved src/config/domains.rs

src/tape/changer/mod.rs

@@ -483,7 +483,7 @@ fn save_changer_state_cache(
 
     let state = serde_json::to_string_pretty(state)?;
 
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0644);
     let options = CreateOptions::new()
         .perm(mode)

src/tape/drive/mod.rs

@@ -553,7 +553,7 @@ pub fn set_tape_device_state(
     let mut path = PathBuf::from(crate::tape::DRIVE_STATE_DIR);
     path.push(drive);
 
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0644);
     let options = CreateOptions::new()
         .perm(mode)
@@ -612,7 +612,7 @@ fn open_device_lock(device_path: &str) -> Result<std::fs::File, Error> {
     let mut path = std::path::PathBuf::from(crate::tape::DRIVE_LOCK_DIR);
     path.push(lock_name);
 
-    let user = crate::backup::backup_user()?;
+    let user = pbs_config::backup_user()?;
     let options = CreateOptions::new()
         .perm(Mode::from_bits_truncate(0o660))
         .owner(user.uid)

src/tape/inventory.rs

@@ -40,6 +40,7 @@ use proxmox::tools::{
 };
 
 use pbs_systemd::time::compute_next_event;
+use pbs_config::{open_backup_lockfile, BackupLockGuard};
 
 use crate::{
     api2::types::{
@@ -48,7 +49,6 @@ use crate::{
         MediaStatus,
         MediaLocation,
     },
-    backup::{open_backup_lockfile, BackupLockGuard},
     tape::{
         TAPE_STATUS_DIR,
         MediaSet,
@@ -174,7 +174,7 @@ impl Inventory {
             // We cannot use chown inside test environment (no permissions)
             CreateOptions::new().perm(mode)
         } else {
-            let backup_user = crate::backup::backup_user()?;
+            let backup_user = pbs_config::backup_user()?;
             CreateOptions::new()
                 .perm(mode)
                 .owner(backup_user.uid)

src/tape/media_catalog.rs

@@ -183,7 +183,7 @@ impl MediaCatalog {
     }
 
     fn create_basedir(base_path: &Path) -> Result<(), Error> {
-        let backup_user = crate::backup::backup_user()?;
+        let backup_user = pbs_config::backup_user()?;
         let mode = nix::sys::stat::Mode::from_bits_truncate(0o0640);
         let opts = CreateOptions::new()
             .perm(mode)
@@ -217,7 +217,7 @@ impl MediaCatalog {
                 .create(create)
                 .open(&path)?;
 
-            let backup_user = crate::backup::backup_user()?;
+            let backup_user = pbs_config::backup_user()?;
             fchown(file.as_raw_fd(), Some(backup_user.uid), Some(backup_user.gid))
                 .map_err(|err| format_err!("fchown failed - {}", err))?;
 
@@ -275,7 +275,7 @@ impl MediaCatalog {
             return Ok(file);
         }
 
-        let backup_user = crate::backup::backup_user()?;
+        let backup_user = pbs_config::backup_user()?;
         fchown(file.as_raw_fd(), Some(backup_user.uid), Some(backup_user.gid))
             .map_err(|err| format_err!("fchown failed - {}", err))?;
 

src/tape/media_catalog_cache.rs

@@ -91,7 +91,7 @@ fn write_snapshot_cache(
         }
     }
 
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0640);
     let options = CreateOptions::new()
         .perm(mode)

src/tape/media_pool.rs

@@ -16,9 +16,9 @@ use proxmox::tools::Uuid;
 
 use pbs_api_types::Fingerprint;
 use pbs_systemd::time::compute_next_event;
+use pbs_config::BackupLockGuard;
 
 use crate::{
-    backup::BackupLockGuard,
     api2::types::{
         MediaStatus,
         MediaLocation,

src/tape/mod.rs

@@ -71,7 +71,7 @@ pub const COMMIT_BLOCK_SIZE: usize = 128*1024*1024*1024; // 128 GiB
 
 /// Create tape status dir with correct permission
 pub fn create_tape_status_dir() -> Result<(), Error> {
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0750);
     let options = CreateOptions::new()
         .perm(mode)
@@ -86,7 +86,7 @@ pub fn create_tape_status_dir() -> Result<(), Error> {
 
 /// Create drive lock dir with correct permission
 pub fn create_drive_lock_dir() -> Result<(), Error> {
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0750);
     let options = CreateOptions::new()
         .perm(mode)
@@ -101,7 +101,7 @@ pub fn create_drive_lock_dir() -> Result<(), Error> {
 
 /// Create drive state dir with correct permission
 pub fn create_drive_state_dir() -> Result<(), Error> {
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0750);
     let options = CreateOptions::new()
         .perm(mode)
@@ -116,7 +116,7 @@ pub fn create_drive_state_dir() -> Result<(), Error> {
 
 /// Create changer state cache dir with correct permission
 pub fn create_changer_state_dir() -> Result<(), Error> {
-    let backup_user = crate::backup::backup_user()?;
+    let backup_user = pbs_config::backup_user()?;
     let mode = nix::sys::stat::Mode::from_bits_truncate(0o0750);
     let options = CreateOptions::new()
         .perm(mode)