diff options
| -rw-r--r-- | .luacheckrc | 5 | ||||
| -rw-r--r-- | core/certmanager.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_admin_shell.lua | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/.luacheckrc b/.luacheckrc index 09225d01..1a392dab 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -131,6 +131,11 @@ files["spec/"] = { 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 --git a/core/certmanager.lua b/core/certmanager.lua index c08bcc84..b13d57b3 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -127,7 +127,6 @@ local function index_certs(dir, files_by_name, depth_limit) 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 --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua index 56bc3cc9..d6d082f3 100644 --- a/plugins/mod_admin_shell.lua +++ b/plugins/mod_admin_shell.lua @@ -2410,10 +2410,17 @@ function def_env.debug:cert_index(path) 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 @@ function def_env.debug:cert_index(path) { 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 |