s2smanager: Remove the infamous 'as per RFC' log message entirely (it happens too...

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 4ee5f65a0105de1835fb5cbb26f406738b7f1f1c..ccc1e2f9cfe5d86f8d3d55353d3842911aad35be 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -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 = {};