all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Leo Nunner <l.nunner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 docs] vzdump: document the new cluster-wide config file
Date: Tue,  7 Mar 2023 13:11:06 +0100	[thread overview]
Message-ID: <20230307121106.56820-5-l.nunner@proxmox.com> (raw)
In-Reply-To: <20230307121106.56820-1-l.nunner@proxmox.com>

+ change the wording from "Global configuration" to "Node-wide
configuration"

Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
 vzdump.adoc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/vzdump.adoc b/vzdump.adoc
index ce46529..6c2023d 100644
--- a/vzdump.adoc
+++ b/vzdump.adoc
@@ -473,13 +473,18 @@ entire process happens transparently from a user's point of view.
 Configuration
 -------------
 
-Global configuration is stored in `/etc/vzdump.conf`. The file uses a
-simple colon separated key/value format. Each line has the following
-format:
+Node-wide configuration is stored in `/etc/vzdump.conf`. A cluster-wide
+configuration can be found at `/etc/pve/vzdump.conf`. The configuration files
+take precedence in the following order: first, the job/CLI options are
+read. If an option is not defined there, it is taken from the node-wide
+configuration, and, if not defined there either, it gets looked up in the
+cluster-wide configuration. Should it not be defined there either, the default
+value is used. The files use a simple colon separated key/value format. Each
+line has the following format:
 
  OPTION: value
 
-Blank lines in the file are ignored, and lines starting with a `#`
+Blank lines in the files are ignored, and lines starting with a `#`
 character are treated as comments and are also ignored. Values from
 this file are used as default, and can be overwritten on the command
 line.
-- 
2.30.2





      parent reply	other threads:[~2023-03-07 12:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07 12:11 [pve-devel] [PATCH v2 cluster manager docs] Introduce cluster-wide vzdump configuration Leo Nunner
2023-03-07 12:11 ` [pve-devel] [PATCH v2 cluster] fix #4234: vzdump: add cluster-wide configuration Leo Nunner
2023-03-11 17:12   ` [pve-devel] applied: " Thomas Lamprecht
2023-03-07 12:11 ` [pve-devel] [PATCH v2 manager 1/2] fix #4235: " Leo Nunner
2023-03-07 12:11 ` [pve-devel] [PATCH v2 manager 2/2] test: allow access to the cluster-wide 'vzdump.conf' Leo Nunner
2023-03-07 12:11 ` Leo Nunner [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230307121106.56820-5-l.nunner@proxmox.com \
    --to=l.nunner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal