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 B7DA1633F9 for ; Thu, 24 Feb 2022 15:19:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE97318F6A for ; Thu, 24 Feb 2022 15:19:04 +0100 (CET) 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 id BA49218F3E for ; Thu, 24 Feb 2022 15:19:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FF7241B37 for ; Thu, 24 Feb 2022 15:19:03 +0100 (CET) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Thu, 24 Feb 2022 15:18:50 +0100 Message-Id: <20220224141854.3153101-2-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220224141854.3153101-1-s.sterz@proxmox.com> References: <20220224141854.3153101-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.rs, node.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 1/5] fix #3067: api: add support for a comment field in node.cfg 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: Thu, 24 Feb 2022 14:19:34 -0000 Signed-off-by: Stefan Sterz --- src/api2/node/config.rs | 4 ++++ src/config/node.rs | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/api2/node/config.rs b/src/api2/node/config.rs index 0a119354..77fe69fe 100644 --- a/src/api2/node/config.rs +++ b/src/api2/node/config.rs @@ -64,6 +64,8 @@ pub enum DeletableProperty { ciphers_tls_1_2, /// Delete the default-lang property. default_lang, + /// Delete any comment + comment, } #[api( @@ -124,6 +126,7 @@ pub fn update_node_config( DeletableProperty::ciphers_tls_1_3 => { config.ciphers_tls_1_3 = None; }, DeletableProperty::ciphers_tls_1_2 => { config.ciphers_tls_1_2 = None; }, DeletableProperty::default_lang => { config.default_lang = None; }, + DeletableProperty::comment => { config.comment = None; }, } } } @@ -139,6 +142,7 @@ pub fn update_node_config( if update.ciphers_tls_1_3.is_some() { config.ciphers_tls_1_3 = update.ciphers_tls_1_3; } if update.ciphers_tls_1_2.is_some() { config.ciphers_tls_1_2 = update.ciphers_tls_1_2; } if update.default_lang.is_some() { config.default_lang = update.default_lang; } + if update.comment.is_some() { config.comment = update.comment; } crate::config::node::save_config(&config)?; diff --git a/src/config/node.rs b/src/config/node.rs index 0ba87450..9ca44a52 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -8,7 +8,8 @@ use proxmox_schema::{api, ApiStringFormat, ApiType, Updater}; use proxmox_http::ProxyConfig; -use pbs_api_types::{EMAIL_SCHEMA, OPENSSL_CIPHERS_TLS_1_2_SCHEMA, OPENSSL_CIPHERS_TLS_1_3_SCHEMA}; +use pbs_api_types::{EMAIL_SCHEMA, OPENSSL_CIPHERS_TLS_1_2_SCHEMA, OPENSSL_CIPHERS_TLS_1_3_SCHEMA, + SINGLE_LINE_COMMENT_SCHEMA}; use pbs_buildcfg::configdir; use pbs_config::{open_backup_lockfile, BackupLockGuard}; @@ -167,6 +168,10 @@ pub enum Translation { "default-lang" : { schema: Translation::API_SCHEMA, optional: true, + }, + "comment" : { + optional: true, + schema: SINGLE_LINE_COMMENT_SCHEMA, } }, )] @@ -210,6 +215,10 @@ pub struct NodeConfig { /// Default language used in the GUI #[serde(skip_serializing_if = "Option::is_none")] pub default_lang: Option, + + /// Dashboard comment + #[serde(skip_serializing_if = "Option::is_none")] + pub comment: Option, } impl NodeConfig { -- 2.30.2