From 8799bd02934dbb34cfbac5223a3f4d63feb525a1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 30 Aug 2018 00:17:54 +0200 Subject: prosodyctl: Also look for options that belong in global section under disabled hosts (fixes #1207) Thanks ivucica --- prosodyctl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/prosodyctl b/prosodyctl index 8f1f6b5d..98063d4a 100755 --- a/prosodyctl +++ b/prosodyctl @@ -864,7 +864,7 @@ function commands.check(arg) print(" "..tostring(deprecated_global_options)) ok = false; end - for host, options in enabled_hosts() do + for host, options in it.filter(function (h) return h ~= "*" end, pairs(configmanager.getconfig())) do local host_options = set.new(it.to_array(it.keys(options))); local misplaced_options = set.intersection(host_options, known_global_options); for name in pairs(options) do @@ -884,6 +884,9 @@ function commands.check(arg) print(""); print(" You need to move the following option"..(n>1 and "s" or "")..": "..table.concat(it.to_array(misplaced_options), ", ")); end + end + for host, options in enabled_hosts() do + local host_options = set.new(it.to_array(it.keys(options))); local subdomain = host:match("^[^.]+"); if not(host_options:contains("component_module")) and (subdomain == "jabber" or subdomain == "xmpp" or subdomain == "chat" or subdomain == "im") then -- cgit v1.2.3