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 9FA0671A26; Fri, 11 Jun 2021 13:45:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9768610C6D; Fri, 11 Jun 2021 13:44:39 +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 7C881108F8; Fri, 11 Jun 2021 13:44:27 +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 2F79543796; Fri, 11 Jun 2021 13:44:27 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 11 Jun 2021 13:44:09 +0200 Message-Id: <20210611114418.28772-21-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210611114418.28772-1-f.ebner@proxmox.com> References: <20210611114418.28772-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.840 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. [proxmox.com] Subject: [pve-devel] [RFC v6 proxmox-backup 6/6] enable release upgrade for package repositories X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 11:45:14 -0000 Signed-off-by: Fabian Ebner --- New in v6. Intended for the stable branch. I didn't insert a link yet since the site doesn't exist yet. Cargo.toml | 2 +- debian/control | 2 +- www/ServerAdministration.js | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9556ece8..74a31600 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ pathpatterns = "0.1.2" proxmox = { version = "0.11.5", features = [ "sortable-macro", "api-macro" ] } #proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] } #proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] } -proxmox-apt = "0.1.1" +proxmox-apt = "0.2.0" proxmox-fuse = "0.1.1" proxmox-http = { version = "0.2.1", features = [ "client", "http-helpers", "websocket" ] } #proxmox-http = { version = "0.2.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] } diff --git a/debian/control b/debian/control index a9f235b4..89b0de40 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Build-Depends: debhelper (>= 11), librust-proxmox-0.11+default-dev (>= 0.11.5-~~), librust-proxmox-0.11+sortable-macro-dev (>= 0.11.5-~~), librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~), - librust-proxmox-apt-0.1+default-dev (>= 0.1.1-~~), + librust-proxmox-apt-0.2+default-dev, librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~), librust-proxmox-http-0.2+client-dev (>= 0.2.1-~~), librust-proxmox-http-0.2+default-dev (>= 0.2.1-~~), diff --git a/www/ServerAdministration.js b/www/ServerAdministration.js index 4ea6b275..531d8379 100644 --- a/www/ServerAdministration.js +++ b/www/ServerAdministration.js @@ -1,6 +1,7 @@ Ext.define('PBS.ServerAdministration', { extend: 'Ext.tab.Panel', alias: 'widget.pbsServerAdministration', + mixins: ['Proxmox.Mixin.CBind'], title: gettext('Server Administration'), @@ -59,9 +60,10 @@ Ext.define('PBS.ServerAdministration', { iconCls: 'fa fa-files-o', itemId: 'aptrepositories', nodename: 'localhost', - // FIXME enable for the stable branch, once the release is available - // and insert the link to the upgrade article - majorUpgradeAllowed: false, + cbind: { + majorUpgradeAllowed: () => Proxmox.UserName === 'root@pam', + }, + // FIXME insert link to the upgrade article majorUpgradeLink: "FIXME", }, { -- 2.20.1