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

move tape_encryption_keys.rs to pbs_config workspace

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-07 10:37:08 +02:00
parent bbdda58b35
commit 5839c469c1
9 changed files with 36 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tape/drive/lto/mod.rs
View File

@ -27,18 +27,13 @@ use proxmox::{
sys::error::SysResult,
};
use pbs_api_types::Fingerprint;
use pbs_api_types::{
Fingerprint, MamAttribute, LtoDriveAndMediaStatus, LtoTapeDrive, Lp17VolumeStatistics,
};
use pbs_config::key_config::KeyConfig;
use pbs_tools::run_command;
use crate::{
config,
api2::types::{
MamAttribute,
LtoDriveAndMediaStatus,
LtoTapeDrive,
Lp17VolumeStatistics,
},
tape::{
TapeRead,
TapeWrite,
@ -378,7 +373,7 @@ impl TapeDriver for LtoTapeHandle {
if let Some((ref key_fingerprint, ref uuid)) = key_fingerprint {
let (key_map, _digest) = config::tape_encryption_keys::load_keys()?;
let (key_map, _digest) = pbs_config::tape_encryption_keys::load_keys()?;
match key_map.get(key_fingerprint) {
Some(item) => {

2
src/tape/pool_writer/mod.rs
View File

@ -14,6 +14,7 @@ use anyhow::{bail, Error};
use proxmox::tools::Uuid;
use pbs_datastore::task_log;
use pbs_config::tape_encryption_keys::load_key_configs;
use crate::{
backup::{
@ -42,7 +43,6 @@ use crate::{
media_changer,
},
},
config::tape_encryption_keys::load_key_configs,
};