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 E3F938737
 for <pve-devel@lists.proxmox.com>; Thu, 31 Aug 2023 13:06:27 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id C59848EF3
 for <pve-devel@lists.proxmox.com>; Thu, 31 Aug 2023 13:06:27 +0200 (CEST)
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>; Thu, 31 Aug 2023 13:06:27 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 057C747B01
 for <pve-devel@lists.proxmox.com>; Thu, 31 Aug 2023 13:06:27 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 31 Aug 2023 13:06:18 +0200
Message-Id: <20230831110621.340832-9-l.wagner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230831110621.340832-1-l.wagner@proxmox.com>
References: <20230831110621.340832-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.036 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
Subject: [pve-devel] [PATCH pve-cluster 08/11] datacenter config: add new
 parameters for system mail forwarding
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: Thu, 31 Aug 2023 11:06:27 -0000

This commit adds two new paramters to the 'notify' property string:
  - 'system-mail': Determine whether mails to root should be forwarded
    by the notification system
  - 'system-mail-target': Determine the target to which the
    notification should be forwarded to.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 src/PVE/DataCenterConfig.pm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/PVE/DataCenterConfig.pm b/src/PVE/DataCenterConfig.pm
index 09be6eb..e2619c5 100644
--- a/src/PVE/DataCenterConfig.pm
+++ b/src/PVE/DataCenterConfig.pm
@@ -116,6 +116,28 @@ my $notification_format = {
 	    . " to root via a 'sendmail' notification endpoint.",
 	optional => 1,
     },
+    'system-mail' => {
+	type => 'string',
+	enum => ['always', 'never'],
+	description => "Control if mails to the 'root' user should be forwarded.",
+	verbose_description => "Control if mails to the 'root' user should be forwarded.\n"
+	    . "* 'always' forward always\n"
+	    . "* 'never' forward never.\n"
+	    . "For production systems, turning off mail forwarding is not"
+	    . "recommended!\n",
+	default => 'always',
+	optional => 1,
+    },
+    'target-system-mail' => {
+	type => 'string',
+	format_description => 'TARGET',
+	description => "Control where mails to the 'root' user should be forwarded to.",
+	verbose_description => "Control where mails to the 'root' user should be forwarded to."
+	    . " Has to be the name of a notification target (endpoint or notification group)."
+	    . " If the 'target-system-mail' parameter is not set, the system will send mails"
+	    . " to root via a 'sendmail' notification endpoint.",
+	optional => 1,
+    },
 };
 
 register_standard_option('pve-ha-shutdown-policy', {
-- 
2.39.2