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