From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C12D16AB32 for ; Fri, 5 Mar 2021 23:08:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC8E029D54 for ; Fri, 5 Mar 2021 23:07:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9268A29D46 for ; Fri, 5 Mar 2021 23:07:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 586444627B for ; Fri, 5 Mar 2021 23:07:54 +0100 (CET) Message-ID: <337b8892-5680-073e-0906-973f9c205ab0@proxmox.com> Date: Fri, 5 Mar 2021 23:07:51 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:87.0) Gecko/20100101 Thunderbird/87.0 Content-Language: en-US To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20210301141225.18394-1-s.ivanov@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210301141225.18394-1-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.423 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup-notification.tt, job.pm, pbsconfig.pm, backup.pm] URIBL_SBL 0.644 Contains an URL's NS IP listed in the Spamhaus SBL blocklist [backup.pm] URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [backup.pm] Subject: [pmg-devel] applied: [PATCH pmg-api/gui/docs v2] small improvments for PBS integration 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: , X-List-Received-Date: Fri, 05 Mar 2021 22:08:26 -0000 On 01.03.21 15:12, Stoiko Ivanov wrote: > v2->v1: > * addressed Thomas great feedback!: > ** reordered the patches (the prevention of the race for concurrent > pbs-backup is not before the notification feature) > ** concurrent pbs-backups now simply use a backup-tmpdir indexed by > remote+pid+time instead of locking. > ** printing and exiting on error now happen as before (instead of being delayed) > ** default is 'never' (instead of the unclear mix of 'error' in the schema > and 'never' in the code > ** not having an admin-email configured is treated as warning. > > original cover-letter for v1: > This patchset addresses #3146 and #3154. > Additionally I added patches for small cosmetic cleanups, and a fix > for concurrent pbs-backups (they raced with each other during my tests) > > patch 1/4 for pmg-gui depends on an updated pmg-docs-generator for building > (and on an updated pmg-docs for linking to the correct section) > > pmg-api: > Stoiko Ivanov (3): > backup: pbs: prevent race in concurrent backups > backup: fix #3146 add email notifications > backup: add notify parameter to 'classic' backup > > src/Makefile | 1 + > src/PMG/API2/Backup.pm | 23 +++++++++++-- > src/PMG/API2/PBS/Job.pm | 50 +++++++++++++++++++++------- > src/PMG/Backup.pm | 35 +++++++++++++++++++ > src/PMG/PBSConfig.pm | 7 ++++ > src/templates/backup-notification.tt | 19 +++++++++++ > 6 files changed, 120 insertions(+), 15 deletions(-) > create mode 100644 src/templates/backup-notification.tt > > pmg-gui: > Stoiko Ivanov (4): > backup: pbs: add onlineHelp anchors > backup: fix #3154: make statistic backup optional > backup: pbs: fix #3154: add statistic setting to remote > backup: pbs: fix #3146 add notify setting to remote > > js/BackupRestore.js | 45 ++++++++++++++++++++++++++++--------------- > js/PBSConfig.js | 1 + > js/PBSRemoteEdit.js | 20 +++++++++++++++++++ > js/PBSSnapshotView.js | 19 +++--------------- > 4 files changed, 53 insertions(+), 32 deletions(-) > > pmg-docs: > Stoiko Ivanov (1): > backup: shortly document #3146 and #3154 > > pmgbackup.adoc | 4 ++++ > 1 file changed, 4 insertions(+) > applied now also the remaining patches, thanks!