[pbs-devel] [PATCH proxmox-backup 3/4] server: use configured email-from for sending mail
Hannes Laimer
h.laimer at proxmox.com
Tue Dec 14 13:44:07 CET 2021
Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
---
src/server/email_notifications.rs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs
index 1e7650b0..0dc0cba5 100644
--- a/src/server/email_notifications.rs
+++ b/src/server/email_notifications.rs
@@ -235,6 +235,10 @@ fn send_job_status_mail(
text: &str,
) -> Result<(), Error> {
+ let _lock = crate::config::node::lock()?;
+ let (config, _) = crate::config::node::config()?;
+ let from = config.email_from;
+
// Note: OX has serious problems displaying text mails,
// so we include html as well
let html = format!("<html><body><pre>\n{}\n<pre>", handlebars::html_escape(text));
@@ -248,7 +252,7 @@ fn send_job_status_mail(
&subject,
Some(&text),
Some(&html),
- None,
+ from.as_deref(),
Some(&author),
)?;
--
2.30.2
More information about the pbs-devel
mailing list