aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-22 01:48:42 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-22 01:48:42 +0000
commit2113d0d2552f174a2f86789323ac0c10d3d1e210 (patch)
treeba108903dbe73a9c126ce2986370e77cb15d54e0 /prosodyctl
parent14ac88c99f5465accc184dd144d8d4bfe1951c2d (diff)
parentb9fac6ba28a3f09ebd0f7c0205fe942d468b76a9 (diff)
downloadprosody-2113d0d2552f174a2f86789323ac0c10d3d1e210.tar.gz
prosody-2113d0d2552f174a2f86789323ac0c10d3d1e210.zip
Merge with 0.7
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl10
1 files changed, 7 insertions, 3 deletions
diff --git a/prosodyctl b/prosodyctl
index 676085ee..ccc1e2f9 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -435,7 +435,7 @@ end
function commands.restart(arg)
if arg[1] == "--help" then
- show_usage([[stop]], [[Stop and start a running Prosody server]]);
+ show_usage([[restart]], [[Restart a running Prosody server]]);
return 1;
end
@@ -504,6 +504,10 @@ local http_errors = {
};
function commands.addplugin(arg)
+ if not arg[1] or arg[1] == "--help" then
+ show_usage("addplugin URL", "Download and install a plugin from a URL");
+ return 1;
+ end
local url = arg[1];
if url:match("^http://") then
local http = require "socket.http";
@@ -575,8 +579,8 @@ if not commands[command] then -- Show help for all commands
print("");
print("Where COMMAND may be one of:\n");
- local hidden_commands = require "util.set".new{ "register", "unregister" };
- local commands_order = { "adduser", "passwd", "deluser" };
+ local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
+ local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
local done = {};