From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-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 8F53C1FF380
for <inbox@lore.proxmox.com>; Fri, 19 Apr 2024 12:00:08 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BA99D57FB;
Fri, 19 Apr 2024 12:00:09 +0200 (CEST)
Message-ID: <5fc21182-0297-4f85-8711-f9a2eb5d87f4@proxmox.com>
Date: Fri, 19 Apr 2024 11:59:21 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lukas Wagner <l.wagner@proxmox.com>
References: <20240409132555.364926-1-l.wagner@proxmox.com>
<20240409132555.364926-20-l.wagner@proxmox.com>
Content-Language: en-US
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20240409132555.364926-20-l.wagner@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.069 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
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pve-devel] [PATCH manager 19/19] notifications: use named
templates instead of in-code templates
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Am 09.04.24 um 15:25 schrieb Lukas Wagner:
> diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
> index 152eb3e5..2ea626f0 100644
> --- a/PVE/VZDump.pm
> +++ b/PVE/VZDump.pm
The existing $subject_template and $body_template could be removed now
like for the others
> diff --git a/templates/Makefile b/templates/Makefile
> new file mode 100644
> index 00000000..b0add81e
> --- /dev/null
> +++ b/templates/Makefile
> @@ -0,0 +1,24 @@
> +NOTIFICATION_TEMPLATES= \
> + default/test-subject.txt.hbs \
> + default/test-body.txt.hbs \
> + default/test-body.html.hbs \
> + default/vzdump-subject.txt.hbs \
> + default/vzdump-body.txt.hbs \
> + default/vzdump-body.html.hbs \
> + default/replication-subject.txt.hbs \
> + default/replication-body.txt.hbs \
> + default/replication-body.html.hbs \
> + default/package-updates-subject.txt.hbs \
> + default/package-updates-body.txt.hbs \
> + default/package-updates-body.html.hbs \
> +
Nit: backslashes are not aligned
> diff --git a/templates/default/replication-body.html.hbs b/templates/default/replication-body.html.hbs
> new file mode 100644
> index 00000000..d1dea6a1
> --- /dev/null
> +++ b/templates/default/replication-body.html.hbs
> @@ -0,0 +1,18 @@
> +<html>
> + <body>
> + Replication job '{{job-id}}' with target '{{job-target}}' and schedule '{{job-schedule}}' failed!<br/><br/>
> +
> + Last successful sync: {{timestamp last-sync}}<br/>
> + Next sync try: {{timestamp next-sync}}<br/>
> + Failure count: {{failure-count}}<br/>
> +
> + {{#if (eq failure-count 3)}}
> + Note: The system will now reduce the frequency of error reports, as the job appears to be stuck.
> + {{/if}}
> + <br/>
> + Error:<br/>
> + <pre>
> +{{error}}
Nit: is there a special reason for not indenting this?
> + </pre>
> + </body>
> +</html>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel