From: Leo Nunner <l.nunner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH cluster] fix #4234: vzdump: add cluster-wide configuration
Date: Thu, 9 Feb 2023 10:27:04 +0100 [thread overview]
Message-ID: <20230209092705.29496-3-l.nunner@proxmox.com> (raw)
In-Reply-To: <20230209092705.29496-1-l.nunner@proxmox.com>
Introduce a cluster-wide vzdump.conf file which gets filled with the
default vzdump configuration.
Signed-off-by: Leo Nunner <l.nunner@proxmox.com>
---
data/PVE/Cluster.pm | 1 +
data/PVE/Cluster/Setup.pm | 32 +++++++++++++++++++++++++++++---
data/src/status.c | 1 +
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index 0154aae..efca58f 100644
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -45,6 +45,7 @@ my $dbbackupdir = "/var/lib/pve-cluster/backup";
# using a computed version and only those can be used by the cfs_*_file methods
my $observed = {
'vzdump.cron' => 1,
+ 'vzdump.conf' => 1,
'jobs.cfg' => 1,
'storage.cfg' => 1,
'datacenter.cfg' => 1,
diff --git a/data/PVE/Cluster/Setup.pm b/data/PVE/Cluster/Setup.pm
index 108817e..061fe08 100644
--- a/data/PVE/Cluster/Setup.pm
+++ b/data/PVE/Cluster/Setup.pm
@@ -579,6 +579,28 @@ PATH="/usr/sbin:/usr/bin:/sbin:/bin"
__EOD
+my $vzdump_conf_dummy = <<__EOD;
+# vzdump default settings
+# these are overruled by the node-specific configuration in /etc/vzdump.conf
+
+#tmpdir: DIR
+#dumpdir: DIR
+#storage: STORAGE_ID
+#mode: snapshot|suspend|stop
+#bwlimit: KBPS
+#performance: max-workers=N
+#ionice: PRI
+#lockwait: MINUTES
+#stopwait: MINUTES
+#stdexcludes: BOOLEAN
+#mailto: ADDRESSLIST
+#prune-backups: keep-INTERVAL=N[,...]
+#script: FILENAME
+#exclude-path: PATHLIST
+#pigz: N
+#notes-template: {{guestname}}
+__EOD
+
sub gen_pve_vzdump_symlink {
my $filename = "/etc/pve/vzdump.cron";
@@ -593,10 +615,14 @@ sub gen_pve_vzdump_symlink {
sub gen_pve_vzdump_files {
- my $filename = "/etc/pve/vzdump.cron";
+ my $cron = "/etc/pve/vzdump.cron";
+ my $conf = "/etc/pve/vzdump.conf";
+
+ PVE::Tools::file_set_contents($cron, $vzdump_cron_dummy)
+ if ! -f $cron;
- PVE::Tools::file_set_contents($filename, $vzdump_cron_dummy)
- if ! -f $filename;
+ PVE::Tools::file_set_contents($conf, $vzdump_conf_dummy)
+ if ! -f $conf;
gen_pve_vzdump_symlink();
};
diff --git a/data/src/status.c b/data/src/status.c
index 5e1e841..9e520a5 100644
--- a/data/src/status.c
+++ b/data/src/status.c
@@ -89,6 +89,7 @@ static memdb_change_t memdb_change_array[] = {
{ .path = "priv/ipam.db" },
{ .path = "datacenter.cfg" },
{ .path = "vzdump.cron" },
+ { .path = "vzdump.conf" },
{ .path = "jobs.cfg" },
{ .path = "ha/crm_commands" },
{ .path = "ha/manager_status" },
--
2.30.2
next prev parent reply other threads:[~2023-02-09 9:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 9:27 [pve-devel] [PATCH manager cluster docs] Introduce cluster-wide vzdump configuration Leo Nunner
2023-02-09 9:27 ` [pve-devel] [PATCH manager] fix #4235: vzdump: add cluster-wide configuration Leo Nunner
2023-02-09 9:27 ` Leo Nunner [this message]
2023-03-03 15:33 ` [pve-devel] [PATCH cluster] fix #4234: " Thomas Lamprecht
2023-02-09 9:27 ` [pve-devel] [PATCH docs] vzdump: document the new cluster-wide config file Leo Nunner
2023-02-14 10:06 ` Thomas Lamprecht
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=20230209092705.29496-3-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