From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4C2F27AD4F for ; Wed, 6 Jul 2022 13:33:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 430FCA72C for ; Wed, 6 Jul 2022 13:33:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 6 Jul 2022 13:33:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6FB0843CD1 for ; Wed, 6 Jul 2022 13:33:57 +0200 (CEST) Date: Wed, 6 Jul 2022 13:33:56 +0200 From: Wolfgang Bumiller To: Hannes Laimer Cc: pbs-devel@lists.proxmox.com Message-ID: <20220706113356.y2owpzmxtp4k6loc@casey.proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> <20220705130834.14285-5-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220705130834.14285-5-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.292 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup 02/26] config: make RemovableDeviceConfig savable to config file X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2022 11:33:58 -0000 Design question: Do we need this to be a separate config file though? Can this not simply be part of the datastore directly? We already "link" them by having to define the datastore as `removable`, so can we not just put all the values in there? On Tue, Jul 05, 2022 at 01:08:10PM +0000, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > pbs-config/src/lib.rs | 1 + > pbs-config/src/removable_device.rs | 63 ++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+) > create mode 100644 pbs-config/src/removable_device.rs > > diff --git a/pbs-config/src/lib.rs b/pbs-config/src/lib.rs > index a83db4e1..5ea67652 100644 > --- a/pbs-config/src/lib.rs > +++ b/pbs-config/src/lib.rs > @@ -10,6 +10,7 @@ pub mod metrics; > pub mod network; > pub mod prune; > pub mod remote; > +pub mod removable_device; > pub mod sync; > pub mod tape_encryption_keys; > pub mod tape_job; > diff --git a/pbs-config/src/removable_device.rs b/pbs-config/src/removable_device.rs > new file mode 100644 > index 00000000..4587d72b > --- /dev/null > +++ b/pbs-config/src/removable_device.rs > @@ -0,0 +1,63 @@ > +use std::collections::HashMap; > + > +use anyhow::Error; > +use lazy_static::lazy_static; > + > +use pbs_api_types::{RemovableDeviceConfig, DEVICE_NAME_SCHEMA}; > +use proxmox_schema::*; > +use proxmox_section_config::{SectionConfig, SectionConfigData, SectionConfigPlugin}; > + > +use crate::{open_backup_lockfile, replace_backup_config, BackupLockGuard}; > + > +lazy_static! { > + pub static ref CONFIG: SectionConfig = init(); > +} > + > +fn init() -> SectionConfig { > + const OBJ_SCHEMA: &ObjectSchema = RemovableDeviceConfig::API_SCHEMA.unwrap_object_schema(); > + > + let plugin = SectionConfigPlugin::new( > + "removable-device".to_string(), > + Some(String::from("name")), > + OBJ_SCHEMA, > + ); > + let mut config = SectionConfig::new(&DEVICE_NAME_SCHEMA); > + config.register_plugin(plugin); > + > + config > +} > + > +pub const REMOVABLE_DEVIVE_CFG_FILENAME: &str = "/etc/proxmox-backup/removable-device.cfg"; > +pub const REMOVABLE_DEVIVE_CFG_LOCKFILE: &str = "/etc/proxmox-backup/.removable-device.lck"; > + > +/// Get exclusive lock > +pub fn lock_config() -> Result { > + open_backup_lockfile(REMOVABLE_DEVIVE_CFG_LOCKFILE, None, true) > +} > + > +pub fn config() -> Result<(SectionConfigData, [u8; 32]), Error> { > + let content = proxmox_sys::fs::file_read_optional_string(REMOVABLE_DEVIVE_CFG_FILENAME)?; > + let content = content.unwrap_or_default(); > + > + let digest = openssl::sha::sha256(content.as_bytes()); > + let data = CONFIG.parse(REMOVABLE_DEVIVE_CFG_FILENAME, &content)?; > + > + Ok((data, digest)) > +} > + > +pub fn save_config(config: &SectionConfigData) -> Result<(), Error> { > + let raw = CONFIG.write(REMOVABLE_DEVIVE_CFG_FILENAME, config)?; > + replace_backup_config(REMOVABLE_DEVIVE_CFG_FILENAME, raw.as_bytes()) > +} > + > +// shell completion helper > +pub fn complete_removable_device_name(_arg: &str, _param: &HashMap) -> Vec { > + match config() { > + Ok((data, _digest)) => data > + .sections > + .iter() > + .map(|(name, _)| name.to_string()) > + .collect(), > + Err(_) => return vec![], > + } > +} > -- > 2.30.2