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 E550784E3B for ; Thu, 16 Dec 2021 10:59:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC82C1CE84 for ; Thu, 16 Dec 2021 10:59:30 +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 70AC91CE74 for ; Thu, 16 Dec 2021 10:59:30 +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 3C7324526B; Thu, 16 Dec 2021 10:59:24 +0100 (CET) Message-ID: <8300ab22-adb3-0e70-4083-a330a5bd751a@proxmox.com> Date: Thu, 16 Dec 2021 10:59:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:96.0) Gecko/20100101 Thunderbird/96.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Hannes Laimer References: <20211214124408.17003-1-h.laimer@proxmox.com> <20211214124408.17003-4-h.laimer@proxmox.com> From: Dominik Csapak In-Reply-To: <20211214124408.17003-4-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.190 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 NICE_REPLY_A -0.034 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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: Thu, 16 Dec 2021 09:59:30 -0000 comment inline On 12/14/21 13:44, Hannes Laimer wrote: > 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()?; if you only read from the config, you do not need to lock it we normally atomically replace the config on change, so a read should always result in a valid config > + 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),
>       )?;
>