# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1743706810 -3600
# Node ID 02b35fecb252e1ad0247e490f6a7f98778d46c08
# Parent  02856974396a6e176a61107208f45881fbe12471# Parent  e78e79f1b5f5d29cdbda7ce269ebc87fc126193e
Merge 13.0->trunk

diff -r 02856974396a -r 02b35fecb252 .luacheckrc
--- a/.luacheckrc	Thu Apr 03 16:54:14 2025 +0100
+++ b/.luacheckrc	Thu Apr 03 20:00:10 2025 +0100
@@ -131,6 +131,11 @@
 	std = "+busted";
 	globals = { "randomize" };
 }
+files["spec/tls"] = {
+	-- luacheck complains about the config files here,
+	-- but we don't really care about them
+	only = {};
+}
 files["prosody.cfg.lua"] = {
 	ignore = { "131" };
 	globals = {
diff -r 02856974396a -r 02b35fecb252 core/certmanager.lua
--- a/core/certmanager.lua	Thu Apr 03 16:54:14 2025 +0100
+++ b/core/certmanager.lua	Thu Apr 03 20:00:10 2025 +0100
@@ -127,7 +127,6 @@
 			log("debug", "Skipping non-certificate (based on filename): %s", full);
 		end
 	end
-	log("debug", "Certificate index in %s: %q", dir, files_by_name);
 	-- | hostname | filename | service |
 	return files_by_name;
 end
diff -r 02856974396a -r 02b35fecb252 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Thu Apr 03 16:54:14 2025 +0100
+++ b/plugins/mod_admin_shell.lua	Thu Apr 03 20:00:10 2025 +0100
@@ -2410,10 +2410,17 @@
 
 	local sink = logger.add_simple_sink(function (source, level, message)
 		if source == "certmanager" then
-			self.session.print(source, level, message);
+			if level == "debug" or level == "info" then
+				level = "II";
+			elseif level == "warn" or level == "error" then
+				level = "EE";
+			end
+			self.session.print(level..": "..message);
 		end
 	end);
 
+	print("II: Scanning "..path.."...");
+
 	local index = {};
 	cm.index_certs(path, index)
 
@@ -2436,7 +2443,7 @@
 		{ title = "Service", width = 5 };
 	}, self.session.width);
 	print(row());
-
+	print(("-"):rep(self.session.width or 80));
 	for domain, certs in it.sorted_pairs(index) do
 		for cert_file, services in it.sorted_pairs(certs) do
 			for service in it.sorted_pairs(services) do