aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-28 11:05:00 +0200
committerKim Alvefur <zash@zash.se>2018-06-28 11:05:00 +0200
commit3da6c11ac8e68cfd3fd05e1bfdd751303a1fc279 (patch)
tree871fd3b7bb7eecfd6059a1d2567ca8faff040c8a
parentfd8a2e2de4775b74e9f62c4ab6637a63511e075c (diff)
parentfbec700e42321cd07df5811277d4fb2fbf448496 (diff)
downloadprosody-3da6c11ac8e68cfd3fd05e1bfdd751303a1fc279.tar.gz
prosody-3da6c11ac8e68cfd3fd05e1bfdd751303a1fc279.zip
Merge 0.10->trunk
-rwxr-xr-xprosodyctl4
1 files changed, 4 insertions, 0 deletions
diff --git a/prosodyctl b/prosodyctl
index 70d6f386..8f1f6b5d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -779,6 +779,10 @@ function commands.check(arg)
local ok = true;
local function disabled_hosts(host, conf) return host ~= "*" and conf.enabled ~= false; end
local function enabled_hosts() return it.filter(disabled_hosts, pairs(configmanager.getconfig())); end
+ if not (what == nil or what == "disabled" or what == "config" or what == "dns" or what == "certs") then
+ show_warning("Don't know how to check '%s'. Try one of 'config', 'dns', 'certs' or 'disabled'.", what);
+ return 1;
+ end
if not what or what == "disabled" then
local disabled_hosts_set = set.new();
for host, host_options in it.filter("*", pairs(configmanager.getconfig())) do