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 F1A4EF43F for ; Thu, 15 Dec 2022 12:21:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D03FA6968 for ; Thu, 15 Dec 2022 12:21:58 +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 for ; Thu, 15 Dec 2022 12:21:58 +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 072CC44AA0 for ; Thu, 15 Dec 2022 12:21:58 +0100 (CET) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Thu, 15 Dec 2022 12:21:47 +0100 Message-Id: <20221215112147.100469-3-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221215112147.100469-1-l.nunner@proxmox.com> References: <20221215112147.100469-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.548 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 KAM_EVIL_NUMBERS4 1 Phone Numbers used by scammers SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH docs] docs: document 'dirs' parameter for directory storage X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2022 11:21:59 -0000 Signed-off-by: Leo Nunner --- pve-storage-cifs.adoc | 4 ++++ pve-storage-dir.adoc | 19 ++++++++++++++----- pve-storage-nfs.adoc | 4 ++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pve-storage-cifs.adoc b/pve-storage-cifs.adoc index bb4b902..4d93727 100644 --- a/pve-storage-cifs.adoc +++ b/pve-storage-cifs.adoc @@ -57,6 +57,10 @@ path:: The local mount point. Optional, defaults to `/mnt/pve//`. +dirs:: + +Overrides for the default directory layout. Optional. + .Configuration Example (`/etc/pve/storage.cfg`) ---- cifs: backup diff --git a/pve-storage-dir.adoc b/pve-storage-dir.adoc index 4116fe5..ec1b957 100644 --- a/pve-storage-dir.adoc +++ b/pve-storage-dir.adoc @@ -46,9 +46,18 @@ storage backends. Configuration ~~~~~~~~~~~~~ -This backend supports all common storage properties, and adds an -additional property called `path` to specify the directory. This -needs to be an absolute file system path. +This backend supports all common storage properties, and adds two +additional properties. The `path` property is used to specify the +directory. This needs to be an absolute file system path. + +The optional `dirs` property allows for the default layout to be +changed. It consists of a comma-separated list of identifiers in +the following format: + + vtype:path + +Where `vtype` is one of the allowed content types for the storage, and +`path` is an absolute file system path. .Configuration Example (`/etc/pve/storage.cfg`) ---- @@ -57,12 +66,12 @@ dir: backup content backup prune-backups keep-last=7 max-protected-backups 3 + dirs backup:/custom/backup/dir ---- The above configuration defines a storage pool called `backup`. That pool can be used to store up to 7 regular backups (`keep-last=7`) and 3 protected backups -per VM. The real path for the backup files is `/mnt/backup/dump/...`. - +per VM. The real path for the backup files is `/mnt/backup/custom/backup/dir/...`. File naming conventions ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pve-storage-nfs.adoc b/pve-storage-nfs.adoc index 9a90057..95ee45d 100644 --- a/pve-storage-nfs.adoc +++ b/pve-storage-nfs.adoc @@ -40,6 +40,10 @@ path:: The local mount point (defaults to `/mnt/pve//`). +dirs:: + +Overrides for the default directory layout. Optional. + options:: NFS mount options (see `man nfs`). -- 2.30.2