From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 3/4] server: use configured email-from for sending mail
Date: Mon, 3 Jan 2022 10:04:55 +0100 [thread overview]
Message-ID: <20220103090456.17494-4-h.laimer@proxmox.com> (raw)
In-Reply-To: <20220103090456.17494-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
src/server/email_notifications.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs
index 33b106b4..4d734368 100644
--- a/src/server/email_notifications.rs
+++ b/src/server/email_notifications.rs
@@ -235,6 +235,9 @@ fn send_job_status_mail(
text: &str,
) -> Result<(), Error> {
+ 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 +251,7 @@ fn send_job_status_mail(
subject,
Some(text),
Some(&html),
- None,
+ from.as_deref(),
Some(&author),
)?;
--
2.30.2
next prev parent reply other threads:[~2022-01-03 9:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 9:04 [pbs-devel] [PATCH proxmox-backup v2 0/4] close #3162: add options to configure mail_from address Hannes Laimer
2022-01-03 9:04 ` [pbs-devel] [PATCH proxmox-backup v2 1/4] config: add email-from to NodeConfig Hannes Laimer
2022-01-03 9:04 ` [pbs-devel] [PATCH proxmox-backup v2 2/4] api2: make email-from updatable Hannes Laimer
2022-01-03 9:04 ` Hannes Laimer [this message]
2022-01-03 9:04 ` [pbs-devel] [PATCH proxmox-backup v2 4/4][optional] ui: add new options tab under configuration Hannes Laimer
2022-01-04 7:32 ` [pbs-devel] applied: [PATCH proxmox-backup v2 0/4] close #3162: add options to configure mail_from address Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220103090456.17494-4-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.