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 C79D572777 for ; Wed, 16 Jun 2021 09:27:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B8EA1E7BD for ; Wed, 16 Jun 2021 09:27:05 +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 69B76E78A for ; Wed, 16 Jun 2021 09:27:04 +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 2DDF343FE7 for ; Wed, 16 Jun 2021 09:27:04 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 16 Jun 2021 09:26:54 +0200 Message-Id: <20210616072700.54289-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616072700.54289-1-f.ebner@proxmox.com> References: <20210616072700.54289-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.760 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. [pve6to7.pm] Subject: [pve-devel] [PATCH v2 manager 2/3] pve6to7: add check for CIFS credentials 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, 16 Jun 2021 07:27:05 -0000 Signed-off-by: Fabian Ebner --- New in v2. PVE/CLI/pve6to7.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index b8263dab..f486ac2d 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -574,6 +574,27 @@ sub check_backup_retention_settings { log_pass("no problems found.") if $pass; } +sub check_cifs_credential_location { + log_info("checking CIFS credential location.."); + + my $regex = qr/^(.*)\.cred$/; + + my $found; + + PVE::Tools::dir_glob_foreach('/etc/pve/priv/', $regex, sub { + my ($filename) = @_; + + my ($basename) = $filename =~ $regex; + + log_warn("CIFS credentials '/etc/pve/priv/$filename' will be moved to " . + "'/etc/pve/priv/storage/$basename.pw' during the update"); + + $found = 1; + }); + + log_pass("no CIFS credentials at outdated location found.") if !$found; +} + sub check_misc { print_header("MISCELLANEOUS CHECKS"); my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') }; @@ -665,6 +686,7 @@ sub check_misc { } check_backup_retention_settings(); + check_cifs_credential_location(); } __PACKAGE__->register_method ({ -- 2.20.1