[PATCH guest-common/manager v2 0/3] fix #5713: vzdump: add notification-mode none

[PATCH guest-common/manager v2 0/3] fix #5713: vzdump: add notification-mode none

[Erik Fastermann]

Optionally disable sending notification mails with the new option
none for notification-mode in vzdump.

Also includes an optional commit to add this to the ui.


pve-guest-common:

Erik Fastermann (1):
  fix #5713: vzdump: add notification-mode none

 src/PVE/VZDump/Common.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


pve-manager:

Erik Fastermann (2):
  fix #5713: vzdump: add notification-mode none
  ui: vzdump: add notification-mode none

 PVE/VZDump.pm                 | 2 ++
 www/manager6/window/Backup.js | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)


Summary over all repositories:
  3 files changed, 7 insertions(+), 3 deletions(-)

-- 
Generated by murpp 0.11.0

[PATCH pve-guest-common v2 1/3] fix #5713: vzdump: add notification-mode none

[Erik Fastermann]

Optionally disable sending notification mails with the new option
none for notification-mode in vzdump.

This can be useful if you want to disable sending notifications for a
specific backup job and not change the global notification settings or
use the deprecated legacy sendmail with an empty address.

Signed-off-by: Erik Fastermann <e.fastermann@proxmox.com>
---

 changes since v1:
 * fix small type send -> sent

 src/PVE/VZDump/Common.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm
index 67a4cf4..2cb48a3 100644
--- a/src/PVE/VZDump/Common.pm
+++ b/src/PVE/VZDump/Common.pm
@@ -261,9 +261,10 @@ my $confdesc = {
             . " specified address(es) via the 'sendmail' command. If set to 'notification-system',"
             . " a notification will be sent via PVE's notification system, and the mailto and"
             . " mailnotification will be ignored. If set to 'auto' (default setting), an email will"
-            . " be sent if mailto is set, and the notification system will be used if not.",
+            . " be sent if mailto is set, and the notification system will be used if not."
+            . " If set to 'none', no notification will be sent.",
         optional => 1,
-        enum => ['auto', 'legacy-sendmail', 'notification-system'],
+        enum => ['auto', 'legacy-sendmail', 'notification-system', 'none'],
         default => 'auto',
     },
     tmpdir => {
-- 
2.47.3

[PATCH pve-manager v2 2/3] fix #5713: vzdump: add notification-mode none

[Erik Fastermann]

Optionally disable sending notification mails with the new option
none for notification-mode in vzdump.

This can be useful if you want to disable sending notifications for a
specific backup job and not change the global notification settings or
use the deprecated legacy sendmail with an empty address.

Signed-off-by: Erik Fastermann <e.fastermann@proxmox.com>
---
 PVE/VZDump.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index defe9e0a..f51f87c1 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -496,6 +496,8 @@ sub send_notification {
     my $policy = $opts->{mailnotification} // 'always';
     my $mode = $opts->{"notification-mode"} // 'auto';
 
+    return if $mode eq 'none';
+
     sanitize_task_list($tasklist);
     my ($error_count, $total_size) = aggregate_task_statistics($tasklist);
 
-- 
2.47.3

[PATCH pve-manager v2 3/3] ui: vzdump: add notification-mode none

[Erik Fastermann]

Add the notification-mode none in the ui dropdown for backup jobs.

Signed-off-by: Erik Fastermann <e.fastermann@proxmox.com>
---
 www/manager6/window/Backup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 7c1c54de..0caada65 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -43,13 +43,14 @@ Ext.define('PVE.window.Backup', {
                 ['notification-system', gettext('Use global settings')],
                 // TRANSLATORS: sendmail is a piece of software
                 ['legacy-sendmail', gettext('Use sendmail (legacy)')],
+                ['none', gettext('None')],
             ],
             fieldLabel: gettext('Notification'),
             name: 'notification-mode',
             value: 'notification-system',
             listeners: {
                 change: function (field, value) {
-                    mailtoField.setHidden(value === 'notification-system');
+                    mailtoField.setHidden(value !== 'legacy-sendmail');
                 },
             },
         });
-- 
2.47.3