From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api 2/7] reports: use admin-mail-from as from header
Date: Tue, 25 Feb 2025 13:55:07 +0100 [thread overview]
Message-ID: <20250225135507.535cd440@rosa.proxmox.com> (raw)
In-Reply-To: <82a99898-cdb3-4eb0-bebc-7759a1d23290@proxmox.com>
On Tue, 25 Feb 2025 11:32:49 +0100
Dominik Csapak <d.csapak@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@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;
>
>
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
next prev parent reply other threads:[~2025-02-25 12:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 23:24 [pmg-devel] [PATCH pmg-api 0/6] DKIM sign mails generated by PMG itself Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 1/7] config: add admin-mail-from key Stoiko Ivanov
2025-02-25 10:29 ` Dominik Csapak
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 2/7] reports: use admin-mail-from as from header Stoiko Ivanov
2025-02-25 10:32 ` Dominik Csapak
2025-02-25 12:55 ` Stoiko Ivanov [this message]
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 3/7] smtp-engine: use admin-mail-from as from header for bounces Stoiko Ivanov
2025-02-25 9:53 ` Maximiliano Sandoval
2025-02-25 10:29 ` Stoiko Ivanov
2025-02-25 10:29 ` Dominik Csapak
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 4/7] ruledb: use admin-mail-from where sensible Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 5/7] dkim: signer: degrade missing domain in from header to info Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 6/7] reinject_local_mail: sign mails with DKIM based on header Stoiko Ivanov
2025-02-25 10:32 ` Maximiliano Sandoval
2025-02-25 10:47 ` Dominik Csapak
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=20250225135507.535cd440@rosa.proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pmg-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal