From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pmg-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 9D9241FF15E for <inbox@lore.proxmox.com>; Tue, 25 Feb 2025 11:32:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3AF001A58E; Tue, 25 Feb 2025 11:32:53 +0100 (CET) Message-ID: <82a99898-cdb3-4eb0-bebc-7759a1d23290@proxmox.com> Date: Tue, 25 Feb 2025 11:32:49 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com References: <20250224232451.399803-1-s.ivanov@proxmox.com> <20250224232451.399803-3-s.ivanov@proxmox.com> Content-Language: en-US From: Dominik Csapak <d.csapak@proxmox.com> In-Reply-To: <20250224232451.399803-3-s.ivanov@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup.pm, pmgreport.pm] Subject: Re: [pmg-devel] [PATCH pmg-api 2/7] reports: use admin-mail-from as from header X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com> On 2/25/25 00:24, Stoiko Ivanov wrote: > this sets the admin-mail-from header information for all local emails > generated through the templateing system, which are not already using > the 'mailfrom' setting from the 'spamquar' config-section. > > Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> > --- > src/PMG/Backup.pm | 2 +- > src/PMG/CLI/pmgreport.pm | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/PMG/Backup.pm b/src/PMG/Backup.pm > index c820d6b..99b9a57 100644 > --- a/src/PMG/Backup.pm > +++ b/src/PMG/Backup.pm > @@ -417,7 +417,7 @@ sub send_backup_notification { > > my $tt = PMG::Config::get_template_toolkit(); > > - my $mailfrom = "Proxmox Mail Gateway <postmaster>"; > + my $mailfrom = $cfg->get('admin', 'admin-mail-from', 1) // "Proxmox Mail Gateway <postmaster>"; we use 'Proxmox Mail Gateway <postmaster>' here as default but '<postmaster>' / 'postmaster' elsewhere. But the user can only configure it one time with the same value set for all. Couldn't we also set 'Proxmox Mail Gateway <postmaster>' as default and use that everywhere? Then we could use the default from the config instead of setting the default manually everywhere? > PMG::Utils::finalize_report($tt, 'backup-notification', $vars, $mailfrom, $email); > > } > diff --git a/src/PMG/CLI/pmgreport.pm b/src/PMG/CLI/pmgreport.pm > index 0d7fcc8..39a2309 100644 > --- a/src/PMG/CLI/pmgreport.pm > +++ b/src/PMG/CLI/pmgreport.pm > @@ -358,7 +358,7 @@ __PACKAGE__->register_method ({ > return undef; > } > > - my $mailfrom = "Proxmox Mail Gateway <postmaster>"; > + my $mailfrom = $cfg->get('admin', 'admin-mail-from', 1) // "Proxmox Mail Gateway <postmaster>"; > PMG::Utils::finalize_report($tt, 'pmgreport', $vars, $mailfrom, $email, $param->{debug}); > > return undef; _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel