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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B466292956 for ; Tue, 13 Sep 2022 17:03:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A65A822D47 for ; Tue, 13 Sep 2022 17:03:42 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Sep 2022 17:03:40 +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 B41D54358C for ; Tue, 13 Sep 2022 17:03:40 +0200 (CEST) Date: Tue, 13 Sep 2022 17:03:39 +0200 From: Stoiko Ivanov To: Fabian =?UTF-8?B?R3LDvG5iaWNobGVy?= Cc: Proxmox VE development discussion Message-ID: <20220913170339.26447c0f@rosa.proxmox.com> In-Reply-To: <20220913123035.3097273-1-f.gruenbichler@proxmox.com> References: <20220913123035.3097273-1-f.gruenbichler@proxmox.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.036 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [shellcheck.net, proxmox.com] Subject: Re: [pve-devel] [PATCH manager] postinst: migrate/update APT auth config 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: Tue, 13 Sep 2022 15:03:42 -0000 Thanks for the patch! 2-3 small issues and one nit: On Tue, 13 Sep 2022 14:30:35 +0200 Fabian Gr=C3=BCnbichler wrote: > missed when switching over to Proxmox::RS::Subscription, which stores > the same info in the product-specific /etc/apt/auth.conf.d/pve.conf . >=20 > the top-level file might contain non-PVE-managed entries, so only remove > entries matching "our" machine. >=20 > Signed-off-by: Fabian Gr=C3=BCnbichler > --- > debian/postinst | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) >=20 > diff --git a/debian/postinst b/debian/postinst > index 7be1aa3d..d6216607 100755 > --- a/debian/postinst > +++ b/debian/postinst > @@ -62,6 +62,30 @@ EOF > fi > } > =20 > +migrate_apt_auth_conf() { > + output=3D"" > + removed=3D"" > + match=3D0 > + > + while read l; do nit: shellcheck: https://www.shellcheck.net/wiki/SC2162 -- read without -r will mangle backslashes - not sure if wanted here? > + if echo "$l" | grep -q "^/machine enterprise.proxmox.com/debian/pmg"; t= hen > + match=3D1 > + elif echo "$l" | grep -q "^machine"; then > + match=3D0 > + fi > + done here the '< /etc/apt/auth.conf' is missing (present in the pmg-api patch) > + > + if test -n "$removed"; then > + if test ! -e /etc/apt/auth.conf.d/pmg.conf; then > + echo "Migrating APT auth config for enterprise.proxmox.com to PMG s= pecific file.." > + echo "$removed" > /etc/apt/auth.conf.d/pmg.conf s/pmg.conf/pve.conf for this one > + else > + echo "Removing stale APT auth config from /etc/apt/auth.conf" > + fi > + echo "$output" > /etc/apt/auth.conf this leaves an emtpy /etc/apt/auth.conf (tested on a pmg-install) if the only auth.conf entry was the one for our hosts (maybe `test -n "$output" && echo "$output" > /etc/apt/auth.conf` also maybe printf might save you the trailing newline) > + fi > +} > + > case "$1" in > triggered) > # We don't print a status message here, as dpkg already said > @@ -190,6 +214,12 @@ case "$1" in > fi > done > fi > + > + if test ! -e /proxmox_install_mode && test -n "$2" && dpkg --compare= -versions "$2" 'lt' '7.2.11~'; then > + if test -e /etc/apt/auth.conf ; then > + migrate_apt_auth_conf > + fi > + fi > ;; > =20 > abort-upgrade|abort-remove|abort-deconfigure)