From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <l.wagner@proxmox.com>
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 083CA99B6C
 for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 14:00:46 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id B98AB1FE24
 for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 14:00:14 +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 <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 14:00:12 +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 A566E429C4
 for <pve-devel@lists.proxmox.com>; Tue, 14 Nov 2023 14:00:12 +0100 (CET)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 14 Nov 2023 13:59:30 +0100
Message-Id: <20231114130000.565122-23-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231114130000.565122-1-l.wagner@proxmox.com>
References: <20231114130000.565122-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.012 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: [pve-devel] [PATCH v2 pve-guest-common 22/52] vzdump: deprecate
 mailto/mailnotification/notification-{target, policy}
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 14 Nov 2023 13:00:46 -0000

The first two will be migrated to the notification system, the second
were part for the first attempt for the new notification system.
The first attempt only ever hit pvetest, so we simply tell the user
to not use the two params.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 src/PVE/VZDump/Common.pm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm
index be605af..b93ad86 100644
--- a/src/PVE/VZDump/Common.pm
+++ b/src/PVE/VZDump/Common.pm
@@ -175,21 +175,22 @@ my $confdesc = {
     mailto => {
 	type => 'string',
 	format => 'email-or-username-list',
-	description => "Comma-separated list of email addresses or users that should" .
-	    " receive email notifications. Has no effect if the 'notification-target' option " .
-	    " is set at the same time.",
+	description => "Deprecated: Use notification targets/matchers instead." .
+	    " Comma-separated list of email addresses or users that should" .
+	    " receive email notifications.",
 	optional => 1,
     },
     mailnotification => {
 	type => 'string',
-	description => "Deprecated: use 'notification-policy' instead.",
+	description => "Deprecated: use notification targets/matchers instead." .
+	    " Specify when to send a notification mail",
 	optional => 1,
 	enum => [ 'always', 'failure' ],
 	default => 'always',
     },
     'notification-policy' => {
 	type => 'string',
-	description => "Specify when to send a notification",
+	description => "Deprecated: Do not use",
 	optional => 1,
 	enum => [ 'always', 'failure', 'never'],
 	default => 'always',
@@ -197,10 +198,7 @@ my $confdesc = {
     'notification-target' => {
 	type => 'string',
 	format => 'pve-configid',
-	description => "Determine the target to which notifications should be sent." .
-	    " Can either be a notification endpoint or a notification group." .
-	    " This option takes precedence over 'mailto', meaning that if both are " .
-	    " set, the 'mailto' option will be ignored.",
+	description => "Deprecated: Do not use",
 	optional => 1,
     },
     tmpdir => {
-- 
2.39.2