From 76690de1e9bf73e4d1a80404cecce14c1ef23426 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 5 Jul 2023 18:25:21 +0200 Subject: [PATCH] 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 --- PVE/VZDump/QemuServer.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 3c4ba528..d0d9240b 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -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; }