From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2 2/6] reports: use admin-mail-from as from header
Date: Tue, 25 Feb 2025 16:01:58 +0100 [thread overview]
Message-ID: <20250225150203.455669-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20250225150203.455669-1-s.ivanov@proxmox.com>
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..1a8f282 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');
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..8bad77a 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');
PMG::Utils::finalize_report($tt, 'pmgreport', $vars, $mailfrom, $email, $param->{debug});
return undef;
--
2.39.5
_______________________________________________
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 15:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-25 15:01 [pmg-devel] [PATCH pmg-api/pmg-gui v2 0/6] DKIM sign mails generated by PMG itself Stoiko Ivanov
2025-02-25 15:01 ` [pmg-devel] [PATCH pmg-api v2 1/6] config: add admin-mail-from key Stoiko Ivanov
2025-02-25 15:01 ` Stoiko Ivanov [this message]
2025-02-25 15:01 ` [pmg-devel] [PATCH pmg-api v2 3/6] smtp-engine: use admin-mail-from as from header for bounces Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-api v2 4/6] ruledb: use admin-mail-from where sensible Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-api v2 5/6] dkim: signer: log info instead of die'ing when missing domain Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-api v2 6/6] reinject_local_mail: sign mails with DKIM based on header Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-gui v2 1/1] configuration: options: add admin-mail-from row Stoiko Ivanov
2025-02-25 20:36 ` [pmg-devel] applied-series: [PATCH pmg-api/pmg-gui v2 0/6] DKIM sign mails generated by PMG itself Thomas Lamprecht
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=20250225150203.455669-3-s.ivanov@proxmox.com \
--to=s.ivanov@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