aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-18 17:06:35 +0200
committerKim Alvefur <zash@zash.se>2017-09-18 17:06:35 +0200
commitb70edb66cfffd37c64d5c36c3e9b50571a70807e (patch)
tree24e1fdc33ec6806cd57984492500f8188aafdcf1
parent6ab32342b28e6394ff81fcdc8918049ec9196a67 (diff)
downloadprosody-b70edb66cfffd37c64d5c36c3e9b50571a70807e.tar.gz
prosody-b70edb66cfffd37c64d5c36c3e9b50571a70807e.zip
prosodyctl: Use all enabled hosts if no hostnames passed to cert import
-rwxr-xr-xprosodyctl9
1 files changed, 8 insertions, 1 deletions
diff --git a/prosodyctl b/prosodyctl
index ce81877d..353253ec 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -870,8 +870,15 @@ function cert_commands.import(arg)
while arg[1] and prosody.hosts[ arg[1] ] do
table.insert(hostnames, table.remove(arg, 1));
end
+ if hostnames[1] == nil then
+ for host in pairs(prosody.hosts) do
+ if host ~= "*" and config.get(host, "enabled") ~= false then
+ table.insert(hostnames, host);
+ end
+ end
+ end
if not arg[1] or arg[1] == "--help" then -- Probably forgot the path
- show_usage("cert import HOSTNAME [HOSTNAME+] /path/to/certs [/other/paths/]+",
+ show_usage("cert import [HOSTNAME+] /path/to/certs [/other/paths/]+",
"Copies certificates to "..cert_basedir);
return 1;
end