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 8B6727A082 for ; Thu, 28 Oct 2021 15:01:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C88D20EE4 for ; Thu, 28 Oct 2021 15:01:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 B760620ED9 for ; Thu, 28 Oct 2021 15:01:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8F76B469A9 for ; Thu, 28 Oct 2021 15:01:54 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 28 Oct 2021 15:00:58 +0200 Message-Id: <20211028130058.1308810-13-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211028130058.1308810-1-f.gruenbichler@proxmox.com> References: <20211028130058.1308810-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.325 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jobs.rs, pull.rs] Subject: [pbs-devel] [RFC v3 proxmox-backup 11/11] fix #sync.cfg/pull: don't remove by default X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2021 13:01:55 -0000 and convert existing (manually created/edited) jobs to the previous default value of 'true'. the GUI has always set this value and defaults to 'false'. Signed-off-by: Fabian Grünbichler --- probably want to hold off on this until close to 7.1 bump, so that we can notify potentially affected users of the `pull` API via release notes, and only run the conversion once ;) debian/postinst | 31 +++++++++++++++++++++++++++++++ pbs-api-types/src/jobs.rs | 2 +- src/api2/pull.rs | 2 +- src/server/pull.rs | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/debian/postinst b/debian/postinst index 83352853..af290069 100644 --- a/debian/postinst +++ b/debian/postinst @@ -4,6 +4,14 @@ set -e #DEBHELPER# +update_sync_job() { + job="$1" + + echo "Updating sync job '$job' to make old 'remove-vanished' default explicit.." + proxmox-backup-manager sync-job update "$job" --remove-vanished true \ + || echo "Failed, please check sync.cfg manually!" +} + case "$1" in configure) # need to have user backup in the tape group @@ -32,6 +40,29 @@ case "$1" in echo "Fixing up termproxy user id in task log..." flock -w 30 /var/log/proxmox-backup/tasks/active.lock sed -i 's/:termproxy::\([^@]\+\): /:termproxy::\1@pam: /' /var/log/proxmox-backup/tasks/active || true fi + + if dpkg --compare-versions "$2" 'lt' '7.1-1' && test -e /etc/proxmox-backup/sync.cfg; then + prev_job="" + + # read from HERE doc because POSIX sh limitations + while read -r key value; do + if test "$key" = "sync:"; then + if test -n "$prev_job"; then + # previous job doesn't have an explicit value + update_sync_job "$prev_job" + fi + prev_job=$value + else + prev_job="" + fi + done < Result { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; - let delete = remove_vanished.unwrap_or(true); + let delete = remove_vanished.unwrap_or(false); check_pull_privs(&auth_id, &store, &remote, &remote_store, delete)?; diff --git a/src/server/pull.rs b/src/server/pull.rs index 63bf92b4..e34ac891 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -57,7 +57,7 @@ impl PullParameters { let (remote_config, _digest) = pbs_config::remote::config()?; let remote: Remote = remote_config.lookup("remote", remote)?; - let remove_vanished = remove_vanished.unwrap_or(true); + let remove_vanished = remove_vanished.unwrap_or(false); let source = BackupRepository::new( Some(remote.config.auth_id.clone()), -- 2.30.2