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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E712E61190 for ; Tue, 20 Oct 2020 11:10:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DA5DFC461 for ; Tue, 20 Oct 2020 11:10:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 BD148C436 for ; Tue, 20 Oct 2020 11:10:38 +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 79E5145E49 for ; Tue, 20 Oct 2020 11:10:38 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 20 Oct 2020 11:10:03 +0200 Message-Id: <20201020091012.82723-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201020091012.82723-1-h.laimer@proxmox.com> References: <20201020091012.82723-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs, mod.rs] Subject: [pbs-devel] [PATCH v4 proxmox-backup 01/10] rename VERIFY_SCHEDULE_SCHEMA to VERIFICATION_SCHEDULE_SCHEMA 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: Tue, 20 Oct 2020 09:10:40 -0000 Signed-off-by: Hannes Laimer --- broken config files will be corrected by postinst script in later patch, renamed in order to avoid build breaking patches later src/api2/config/datastore.rs | 4 ++-- src/api2/types/mod.rs | 2 +- src/config/datastore.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 5ab637ce..ad5c03a6 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -77,7 +77,7 @@ pub fn list_datastores( }, "verify-schedule": { optional: true, - schema: VERIFY_SCHEDULE_SCHEMA, + schema: VERIFICATION_SCHEDULE_SCHEMA, }, "keep-last": { optional: true, @@ -216,7 +216,7 @@ pub enum DeletableProperty { }, "verify-schedule": { optional: true, - schema: VERIFY_SCHEDULE_SCHEMA, + schema: VERIFICATION_SCHEDULE_SCHEMA, }, "keep-last": { optional: true, diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs index 75b68879..5a30bb89 100644 --- a/src/api2/types/mod.rs +++ b/src/api2/types/mod.rs @@ -302,7 +302,7 @@ pub const PRUNE_SCHEDULE_SCHEMA: Schema = StringSchema::new( .format(&ApiStringFormat::VerifyFn(crate::tools::systemd::time::verify_calendar_event)) .schema(); -pub const VERIFY_SCHEDULE_SCHEMA: Schema = StringSchema::new( +pub const VERIFICATION_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run verify job at specified schedule.") .format(&ApiStringFormat::VerifyFn(crate::tools::systemd::time::verify_calendar_event)) .schema(); diff --git a/src/config/datastore.rs b/src/config/datastore.rs index aaf977a7..3284a63d 100644 --- a/src/config/datastore.rs +++ b/src/config/datastore.rs @@ -46,7 +46,7 @@ pub const DIR_NAME_SCHEMA: Schema = StringSchema::new("Directory name").schema() }, "verify-schedule": { optional: true, - schema: VERIFY_SCHEDULE_SCHEMA, + schema: VERIFICATION_SCHEDULE_SCHEMA, }, "keep-last": { optional: true, -- 2.20.1