5
0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-05 09:17:55 +03:00

vzdump: reword "master-key but no encryption key" message

.. and make it use a warn level, which can then also mark the whole
task as potentially problematic as with a new enough pve-guest-common
the REST environment worker warn counters are then increased.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-07-05 18:25:21 +02:00
parent b241ddbf15
commit 76690de1e9

View File

@ -539,8 +539,14 @@ sub archive_pbs {
my $encryption_fp = $scfg->{'encryption-key'};
die "encryption configured ('$encryption_fp') but no encryption key file found!\n"
if $encryption_fp;
$self->loginfo("WARNING: backup target is configured with master key, but this backup is not encrypted - master key settings will be ignored!")
if defined($master_keyfile) && -e $master_keyfile;
if (-e $master_keyfile) {
$self->log(
'warn',
"backup target storage is configured with master-key, but no encryption key set!"
." Ignoring master key settings and creating unencrypted backup."
);
}
}
push @$cmd, "qemu-server.conf:$conffile";
@ -619,8 +625,13 @@ sub archive_pbs {
my $encryption_fp = $scfg->{'encryption-key'};
die "encryption configured ('$encryption_fp') but no encryption key file found!\n"
if $encryption_fp;
$self->loginfo("WARNING: backup target is configured with master key, but this backup is not encrypted - master key settings will be ignored!")
if defined($master_keyfile) && -e $master_keyfile;
if (-e $master_keyfile) {
$self->log(
'warn',
"backup target storage is configured with master-key, but no encryption key set!"
." Ignoring master key settings and creating unencrypted backup."
);
}
$params->{encrypt} = JSON::false;
}