From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 4ADA9847DB for ; Tue, 14 Dec 2021 13:44:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 48A5724DE6 for ; Tue, 14 Dec 2021 13:44:24 +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 id 43AFD24DCD for ; Tue, 14 Dec 2021 13:44:23 +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 13C4C450E1 for ; Tue, 14 Dec 2021 13:44:23 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 14 Dec 2021 13:44:07 +0100 Message-Id: <20211214124408.17003-4-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211214124408.17003-1-h.laimer@proxmox.com> References: <20211214124408.17003-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pbs-devel] [PATCH proxmox-backup 3/4] server: use configured email-from for sending mail X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2021 12:44:24 -0000 Signed-off-by: Hannes Laimer --- 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!("

\n{}\n", 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