From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 844431FF15C for ; Fri, 19 Sep 2025 00:26:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2CB5C8EEA; Fri, 19 Sep 2025 00:26:54 +0200 (CEST) Date: Fri, 19 Sep 2025 00:26:16 +0200 From: Stoiko Ivanov To: Hannes Laimer Message-ID: <20250919002616.1b133f2e@rosa.proxmox.com> In-Reply-To: <20250918143142.248758-4-h.laimer@proxmox.com> References: <20250918143142.248758-1-h.laimer@proxmox.com> <20250918143142.248758-4-h.laimer@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758234367684 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 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 Subject: Re: [pmg-devel] [PATCH pmg-api v2 3/3] fix #4023: templates: add plain-text variant of admin report X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pmg-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" Thanks for tackling this so quickly! On Thu, 18 Sep 2025 16:31:42 +0200 Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > v2: > - drop `subject:` line why did you change this? the subject should get stripped out and is not present in resulting report. not having it in place causes `pmgreport` to fail, if you try to remove the text/html part (via `touch /etc/pmg/templates/pmgreport.tt`) But checking this I realized that the docs were a bit tight-lipped on this functionality (and had a factual error): https://git.proxmox.com/?p=pmg-docs.git;a=commitdiff;h=78ac287f22dca4856f8304deb8b88dd0303fdb53 else the plain-text report looks fine! > > src/Makefile | 1 + > src/templates/pmgreport.plain.tt | 50 ++++++++++++++++++++++++++++++++ > 2 files changed, 51 insertions(+) > create mode 100644 src/templates/pmgreport.plain.tt > > diff --git a/src/Makefile b/src/Makefile > index b75c818..2c5ef28 100644 > --- a/src/Makefile > +++ b/src/Makefile > @@ -26,6 +26,7 @@ CONF_MANS= pmg.conf.5 cluster.conf.5 > TEMPLATES = \ > fetchmailrc.tt \ > pmgreport.tt \ > + pmgreport.plain.tt \ > spamreport-verbose.tt \ > spamreport-verbose.plain.tt \ > spamreport-short.tt \ > diff --git a/src/templates/pmgreport.plain.tt b/src/templates/pmgreport.plain.tt > new file mode 100644 > index 0000000..18871b2 > --- /dev/null > +++ b/src/templates/pmgreport.plain.tt > @@ -0,0 +1,50 @@ > +[% IF cluster -%] > +Cluster Status > +[% FOREACH item IN cluster -%] > +- Hostname: [% item.hostname %] > + IP Address: [% item.ip %] > + Role: [% item.type %] > + State: [% item.state %] > + Load: [% item.loadavg1 %] > + Memory: [% item.memory %] > + Disk: [% item.disk %] > +[% IF !loop.last %]---- > +[% END %] > +[% END %] > +[% END %] > +[% IF system -%] > +System Status > +[% FOREACH item IN system -%] > +- [% item.text %]: [% item.value %] > +[% END %] > +[% END %] > +[% IF incoming -%] > +Incoming Mails (24 hours) > +[% FOREACH item IN incoming -%] > +- [% item.text %][% IF item.percentage.defined %] ([% item.percentage %]%)[% END %]: [% item.value %] > +[% END %] > +[% END %] > +[% IF outgoing -%] > +Outgoing Mails (24 hours) > +[% FOREACH item IN outgoing -%] > +- [% item.text %][% IF item.percentage.defined %] ([% item.percentage %]%)[% END %]: [% item.value %] > +[% END %] > +[% END %] > +[% IF virusstat -%] > +Virus Charts (Top 10) > +[% FOREACH item IN virusstat -%] > +- [% item.name %]: [% item.count %] > +[% END %] > +[% END %] > +[% IF virusquar -%] > +Virus Quarantine > +[% FOREACH item IN virusquar -%] > +- [% item.text %]: [% item.value %] > +[% END %] > +[% END %] > +[% IF spamquar -%] > +Spam Quarantine > +[% FOREACH item IN spamquar -%] > +- [% item.text %]: [% item.value %] > +[% END %] > +[% END %] _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel