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 D3F9F75E7E for ; Wed, 14 Jul 2021 12:10:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CA29AF47D for ; Wed, 14 Jul 2021 12:09:53 +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 DC1CAF448 for ; Wed, 14 Jul 2021 12:09:51 +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 9F396417BE for ; Wed, 14 Jul 2021 12:09:51 +0200 (CEST) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Wed, 14 Jul 2021 12:09:30 +0200 Message-Id: <20210714100933.54491-2-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714100933.54491-1-d.jaeger@proxmox.com> References: <20210714100933.54491-1-d.jaeger@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 1.118 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 Subject: [pve-devel] [PATCH manager 2/5 v2] apt update: Inform users about missing subscriptions 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: Wed, 14 Jul 2021 10:10:23 -0000 We assume that users want update notifications for production systems. Those systems should also have an active subscription. Signed-off-by: Dominic Jäger --- v2: new PVE/API2/APT.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm index bd60db33..b6a86595 100644 --- a/PVE/API2/APT.pm +++ b/PVE/API2/APT.pm @@ -36,6 +36,15 @@ my $get_apt_cache = sub { return $apt_cache; }; +# avoid a wall of text in the code +my $get_subscription_message = sub { + my $hostname = shift; + return "You do not have a valid subscription for the server '$hostname'.\n\n" . + "A subscription gives access to the Proxmox VE Enterprise Repository.\n" . + "This repository contains the most stable packages and is recommended for production use.\n" . + "Please visit www.proxmox.com to get a list of available options.\n\n\n" +}; + use base qw(PVE::RESTHandler); __PACKAGE__->register_method({ @@ -345,7 +354,12 @@ __PACKAGE__->register_method({ my $mailfrom = $dcconf->{email_from} || "root"; my $subject = "New software packages available ($hostname)"; - my $data = "The following updates are available:\n\n"; + my $info = PVE::INotify::read_file('subscription'); + my $has_subscription = $info && $info->{status} eq 'Active'; + + my $data = ""; + $data .= $get_subscription_message->($hostname) if !$has_subscription; + $data .= "The following updates are available:\n\n"; my $count = 0; foreach my $p (sort {$a->{Package} cmp $b->{Package} } @$pkglist) { -- 2.30.2