[pmg-devel] [PATCH pmg-api 2/7] reports: use admin-mail-from as from header

[Stoiko Ivanov]

On Tue, 25 Feb 2025 11:32:49 +0100
Dominik Csapak <d.csapak at proxmox.com> wrote:

> 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 at 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?

Looking through the changes in the series - the places where we use
'postmaster' (w/o "Proxmox Mail Gateway ") in the from-header are:
* Notification mails. 
* generate_ndr in SMTP.pm (before-queue-filtering blocking mails only for
  part of the receivers and generate_ndr_on_block set)

I think this change in behavior is acceptable (Notifications  - and would
rewrite it that way (should make things a bit shorter too)

Thanks for the tip!


> 
> >       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;  
> 
>