Software `/` code `/` prosody

Annotate

prosodyctl @ 4195:6811a229d92c

net.httpserver: Fix HTTP after commit c299726d2b4e and add a 500 error response if a request handler fails to make a response to the client

author	Matthew Wild <mwild1@gmail.com>
date	Wed, 23 Feb 2011 00:31:12 +0000
parent	4189:ab1a0ffbfdf5
child	4167:9c60cc8dc142

rev	line source
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 #!/usr/bin/env lua
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1501 diff changeset	2 -- Prosody IM
3862 ec8bcd766693 prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3861 diff changeset	3 -- Copyright (C) 2008-2010 Matthew Wild
ec8bcd766693 prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3861 diff changeset	4 -- Copyright (C) 2008-2010 Waqas Hussain
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	5 --
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 -- This project is MIT/X11 licensed. Please see the
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 -- COPYING file in the source package for more information.
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 --
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	10 -- prosodyctl - command-line controller for Prosody XMPP server
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	11
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 -- Will be modified by configure script if run --
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	13
3861 82cf0e8bcdab prosodyctl: Read PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3859 diff changeset	14 CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
3861 82cf0e8bcdab prosodyctl: Read PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3859 diff changeset	16 CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	18
3862 ec8bcd766693 prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3861 diff changeset	19 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	20
4065 2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	21 local function is_relative(path)
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	22 local path_sep = package.config:sub(1,1);
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	23 return ((path_sep == "/" and path:sub(1,1) ~= "/")
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	24 or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	25 end
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	26
3862 ec8bcd766693 prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3861 diff changeset	27 -- Tell Lua where to find our libraries
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 if CFG_SOURCEDIR then
4065 2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	29 local function filter_relative_paths(path)
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	30 if is_relative(path) then return ""; end
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	31 end
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	32 local function sanitise_paths(paths)
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	33 return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	34 end
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	35 package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
2e03ded9b8e3 prosody, prosodyctl: Filter out relative paths from package.(c)path when installed Matthew Wild <mwild1@gmail.com> parents: 4064 diff changeset	36 package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	38
3862 ec8bcd766693 prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable. Waqas Hussain <waqas20@gmail.com> parents: 3861 diff changeset	39 -- Substitute ~ with path to home directory in data path
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 if CFG_DATADIR then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	41 if os.getenv("HOME") then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	45
3013 518e3f6f9946 prosodyctl: Relocate global prosody object creation (see fff153f7f4de) Matthew Wild <mwild1@gmail.com> parents: 2706 diff changeset	46 -- Global 'prosody' object
4064 902f2ac67483 prosody, prosodyctl: Create prosody object as a local before exporting as a global Matthew Wild <mwild1@gmail.com> parents: 3922 diff changeset	47 local prosody = {
3892 070d04b56a48 prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along Matthew Wild <mwild1@gmail.com> parents: 3862 diff changeset	48 hosts = {};
070d04b56a48 prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along Matthew Wild <mwild1@gmail.com> parents: 3862 diff changeset	49 events = require "util.events".new();
070d04b56a48 prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along Matthew Wild <mwild1@gmail.com> parents: 3862 diff changeset	50 platform = "posix";
070d04b56a48 prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along Matthew Wild <mwild1@gmail.com> parents: 3862 diff changeset	51 lock_globals = function () end;
070d04b56a48 prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along Matthew Wild <mwild1@gmail.com> parents: 3862 diff changeset	52 unlock_globals = function () end;
3013 518e3f6f9946 prosodyctl: Relocate global prosody object creation (see fff153f7f4de) Matthew Wild <mwild1@gmail.com> parents: 2706 diff changeset	53 };
4064 902f2ac67483 prosody, prosodyctl: Create prosody object as a local before exporting as a global Matthew Wild <mwild1@gmail.com> parents: 3922 diff changeset	54 _G.prosody = prosody;
3013 518e3f6f9946 prosodyctl: Relocate global prosody object creation (see fff153f7f4de) Matthew Wild <mwild1@gmail.com> parents: 2706 diff changeset	55
3922 b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	56 local dependencies = require "util.dependencies";
b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	57 if not dependencies.check_dependencies() then
b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	58 os.exit(1);
b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	59 end
b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	60
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 config = require "core.configmanager"
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	62
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 do
3859 f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	64 local filenames = {};
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	65
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	66 local filename;
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	67 if arg[1] == "--config" and arg[2] then
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	68 table.insert(filenames, arg[2]);
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	69 table.remove(arg, 1); table.remove(arg, 1);
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	70 if CFG_CONFIGDIR then
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	71 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	72 end
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	73 else
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	74 for _, format in ipairs(config.parsers()) do
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	75 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	76 end
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	77 end
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	78 for _,_filename in ipairs(filenames) do
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	79 filename = _filename;
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	80 local file = io.open(filename);
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	81 if file then
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	82 file:close();
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	83 CFG_CONFIGDIR = filename:match("^(.)[\\/][^\\/]$");
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	84 break;
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	85 end
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	86 end
f3216c4a34e8 prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable). Waqas Hussain <waqas20@gmail.com> parents: 3846 diff changeset	87 local ok, level, err = config.load(filename);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	88 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	89 print("\n");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	90 print("**************************");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	91 if level == "parser" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	92 print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	93 local err_line, err_message = tostring(err):match("%[string .-%]:(%d): (.)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	94 print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err)));
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	95 print("");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	96 elseif level == "file" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	97 print("Prosody was unable to find the configuration file.");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	98 print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	99 print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	100 print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	101 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	102 print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	103 print("Good luck!");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	104 print("**************************");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	105 print("");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	106 os.exit(1);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	107 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	108 end
3339 7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	109 local original_logging_config = config.get("*", "core", "log");
3338 d50b6b3efad1 prosodyctl: Force log output always to the console instead of using the config, which avoids creating log files as the wrong user Matthew Wild <mwild1@gmail.com> parents: 3337 diff changeset	110 config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
d50b6b3efad1 prosodyctl: Force log output always to the console instead of using the config, which avoids creating log files as the wrong user Matthew Wild <mwild1@gmail.com> parents: 3337 diff changeset	111
4095 6ad7ed619d37 prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) Matthew Wild <mwild1@gmail.com> parents: 4065 diff changeset	112 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
4189 ab1a0ffbfdf5 prosodyctl: Support for plugin_paths config option Matthew Wild <mwild1@gmail.com> parents: 4178 diff changeset	113 local custom_plugin_paths = config.get("*", "core", "plugin_paths");
ab1a0ffbfdf5 prosodyctl: Support for plugin_paths config option Matthew Wild <mwild1@gmail.com> parents: 4178 diff changeset	114 if custom_plugin_paths then
ab1a0ffbfdf5 prosodyctl: Support for plugin_paths config option Matthew Wild <mwild1@gmail.com> parents: 4178 diff changeset	115 CFG_PLUGINDIR = table.concat(custom_plugin_paths, package.config:sub(3,3)); -- path1;path2;path3
ab1a0ffbfdf5 prosodyctl: Support for plugin_paths config option Matthew Wild <mwild1@gmail.com> parents: 4178 diff changeset	116 end
4095 6ad7ed619d37 prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) Matthew Wild <mwild1@gmail.com> parents: 4065 diff changeset	117 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
6ad7ed619d37 prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) Matthew Wild <mwild1@gmail.com> parents: 4065 diff changeset	118 plugins = CFG_PLUGINDIR, data = data_path };
6ad7ed619d37 prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) Matthew Wild <mwild1@gmail.com> parents: 4065 diff changeset	119
2587 c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2566 diff changeset	120 require "core.loggingmanager"
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2566 diff changeset	121
3922 b77bafa4c502 prosody, prosodyctl, util.dependencies: Split checking and logging of dependencies so we can check hard deps before the config and logging is loaded Matthew Wild <mwild1@gmail.com> parents: 3895 diff changeset	122 dependencies.log_warnings();
2587 c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain) Matthew Wild <mwild1@gmail.com> parents: 2566 diff changeset	123
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	124 -- Switch away from root and into the prosody user --
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	125 local switched_user, current_uid;
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	126
3481 72d3c8029178 util.pposix: Add pposix.uname(), bump version Matthew Wild <mwild1@gmail.com> parents: 3471 diff changeset	127 local want_pposix_version = "0.3.5";
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	128 local ok, pposix = pcall(require, "util.pposix");
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	129
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	130 if ok and pposix then
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	131 if pposix._VERSION ~= want_pposix_version then print(string.format("Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version)); return; end
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	132 current_uid = pposix.getuid();
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	133 if current_uid == 0 then
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	134 -- We haz root!
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	135 local desired_user = config.get("*", "core", "prosody_user") or "prosody";
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	136 local desired_group = config.get("*", "core", "prosody_group") or desired_user;
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	137 local ok, err = pposix.setgid(desired_group);
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	138 if ok then
3471 482275e38224 util.pposix, prosodyctl, mod_posix: Add initgroups() function, and bump module version. prosodyctl inits groups with the groups of prosody_user. (thanks dbb) Matthew Wild <mwild1@gmail.com> parents: 3339 diff changeset	139 ok, err = pposix.initgroups(desired_user);
482275e38224 util.pposix, prosodyctl, mod_posix: Add initgroups() function, and bump module version. prosodyctl inits groups with the groups of prosody_user. (thanks dbb) Matthew Wild <mwild1@gmail.com> parents: 3339 diff changeset	140 end
482275e38224 util.pposix, prosodyctl, mod_posix: Add initgroups() function, and bump module version. prosodyctl inits groups with the groups of prosody_user. (thanks dbb) Matthew Wild <mwild1@gmail.com> parents: 3339 diff changeset	141 if ok then
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	142 ok, err = pposix.setuid(desired_user);
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	143 if ok then
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	144 -- Yay!
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	145 switched_user = true;
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	146 end
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	147 end
5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	148 if not switched_user then
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	149 -- Boo!
1580 5be6dc582df3 prosodyctl: Also switch group when we switch user Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	150 print("Warning: Couldn't switch to Prosody user/group '"..tostring(desired_user).."'/'"..tostring(desired_group).."': "..tostring(err));
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	151 end
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	152 end
2439 511ba389147a prosodyctl: Set umask to protect data files, bump pposix dep to 0.3.2 Matthew Wild <mwild1@gmail.com> parents: 2410 diff changeset	153
511ba389147a prosodyctl: Set umask to protect data files, bump pposix dep to 0.3.2 Matthew Wild <mwild1@gmail.com> parents: 2410 diff changeset	154 -- Set our umask to protect data files
511ba389147a prosodyctl: Set umask to protect data files, bump pposix dep to 0.3.2 Matthew Wild <mwild1@gmail.com> parents: 2410 diff changeset	155 pposix.umask(config.get("*", "core", "umask") or "027");
1114 c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	156 else
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	157 print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	158 print("For more help send the below error to us through http://prosody.im/discuss");
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	159 print(tostring(pposix))
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	160 end
c463e30da312 prosodyctl: Switch to Prosody user before attempting to do anything Matthew Wild <mwild1@gmail.com> parents: 1102 diff changeset	161
3339 7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	162 local function test_writeable(filename)
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	163 local f, err = io.open(filename, "a");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	164 if not f then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	165 return false, err;
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	166 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	167 f:close();
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	168 return true;
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	169 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	170
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	171 local unwriteable_files = {};
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	172 if type(original_logging_config) == "string" and original_logging_config:sub(1,1) ~= "*" then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	173 local ok, err = test_writeable(original_logging_config);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	174 if not ok then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	175 table.insert(unwriteable_files, err);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	176 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	177 elseif type(original_logging_config) == "table" then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	178 for _, rule in ipairs(original_logging_config) do
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	179 if rule.filename then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	180 local ok, err = test_writeable(rule.filename);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	181 if not ok then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	182 table.insert(unwriteable_files, err);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	183 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	184 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	185 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	186 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	187
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	188 if #unwriteable_files > 0 then
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	189 print("One of more of the Prosody log files are not");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	190 print("writeable, please correct the errors and try");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	191 print("starting prosodyctl again.");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	192 print("");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	193 for _, err in ipairs(unwriteable_files) do
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	194 print(err);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	195 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	196 print("");
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	197 os.exit(1);
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	198 end
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	199
7893055e54d1 prosodyctl: Warn and exit if any log files are not writeable, fixes #94 Matthew Wild <mwild1@gmail.com> parents: 3338 diff changeset	200
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 local error_messages = setmetatable({
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 ["invalid-username"] = "The given username is invalid in a Jabber ID";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	203 ["invalid-hostname"] = "The given hostname is invalid";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	204 ["no-password"] = "No password was supplied";
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 ["no-such-user"] = "The given user does not exist on the server";
1124 055cfdc96afa prosodyctl: Add message for unable-to-save-data error Matthew Wild <mwild1@gmail.com> parents: 1122 diff changeset	206 ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
2065 c384ae8ee17a prosodyctl: Put 'pidfile' in quotes to make more clear that it is the literal name of the option Matthew Wild <mwild1@gmail.com> parents: 2020 diff changeset	207 ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help";
3627 9e62937c9757 prosodyctl, util.prosodyctl: Show error when mod_posix is not enabled and an attempt is made to query Prosody's status (thanks stever) Matthew Wild <mwild1@gmail.com> parents: 3481 diff changeset	208 ["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info";
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	209 ["no-such-method"] = "This module has no commands";
1460 5882ed6219ff prosodyctl: Add message for not-running error Matthew Wild <mwild1@gmail.com> parents: 1459 diff changeset	210 ["not-running"] = "Prosody is not running";
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	211 }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	212
2442 94c676b585c0 prosodyctl: Move definition of prosody singleton to prior to loading datamanager, and add platform Matthew Wild <mwild1@gmail.com> parents: 2439 diff changeset	213 hosts = prosody.hosts;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	214
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	215 local function make_host(hostname)
3630 e0c67b14d25f prosodyctl: Give hosts type = 'local' Matthew Wild <mwild1@gmail.com> parents: 3627 diff changeset	216 return {
e0c67b14d25f prosodyctl: Give hosts type = 'local' Matthew Wild <mwild1@gmail.com> parents: 3627 diff changeset	217 type = "local",
e0c67b14d25f prosodyctl: Give hosts type = 'local' Matthew Wild <mwild1@gmail.com> parents: 3627 diff changeset	218 events = prosody.events,
e0c67b14d25f prosodyctl: Give hosts type = 'local' Matthew Wild <mwild1@gmail.com> parents: 3627 diff changeset	219 users = require "core.usermanager".new_null_provider(hostname)
e0c67b14d25f prosodyctl: Give hosts type = 'local' Matthew Wild <mwild1@gmail.com> parents: 3627 diff changeset	220 };
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	221 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	222
2020 24f54340a670 prosodyctl: Remove dependency on hostmanager, and friends Matthew Wild <mwild1@gmail.com> parents: 1580 diff changeset	223 for hostname, config in pairs(config.getconfig()) do
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	224 hosts[hostname] = make_host(hostname);
2020 24f54340a670 prosodyctl: Remove dependency on hostmanager, and friends Matthew Wild <mwild1@gmail.com> parents: 1580 diff changeset	225 end
24f54340a670 prosodyctl: Remove dependency on hostmanager, and friends Matthew Wild <mwild1@gmail.com> parents: 1580 diff changeset	226
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	227 require "core.modulemanager"
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	228
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 require "util.prosodyctl"
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	230 require "socket"
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	231 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	232
4178 760f644c0ca3 prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	233 local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning;
760f644c0ca3 prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	234 local show_usage = prosodyctl.show_usage;
760f644c0ca3 prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	235 local getchar, getpass = prosodyctl.getchar, prosodyctl.getpass;
760f644c0ca3 prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	236 local show_yesno = prosodyctl.show_yesno;
760f644c0ca3 prosodyctl, util.prosodyctl: Move UI functions to util.prosodyctl so they can be used outside of prosodyctl itself Matthew Wild <mwild1@gmail.com> parents: 4095 diff changeset	237 local read_password = prosodyctl.read_password;
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	238
545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	239 local prosodyctl_timeout = (config.get("", "core", "prosodyctl_timeout") or 5) 2;
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	240 -----------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	241 local commands = {};
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	242 local command = arg[1];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	243
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	244 function commands.adduser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	245 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	246 show_usage([[adduser JID]], [[Create the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	247 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	248 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	249 local user, host = arg[1]:match("([^@]+)@(.+)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	250 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	251 show_message [[Failed to understand JID, please supply the JID you want to create]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	252 show_usage [[adduser user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	253 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	254 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	255
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	256 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	257 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	258 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	259 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	260
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	261 if not hosts[host] then
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	262 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	263 show_warning("The user will not be able to log in until this is changed.");
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	264 hosts[host] = make_host(host);
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	265 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	266
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	267 if prosodyctl.user_exists{ user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	268 show_message [[That user already exists]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	269 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	270 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	271
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	272 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	273 if not password then return 1; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	274
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	275 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	276
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 if ok then return 0; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	278
3895 84f8153d06ce mod_admin_adhoc: Support for reloading multiple modules Florian Zeitz <florob@babelmonkeys.de> parents: 3892 diff changeset	279 show_message(msg)
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	280 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	281 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	282
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	283 function commands.passwd(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	284 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	285 show_usage([[passwd JID]], [[Set the password for the specified user account in Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	286 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	287 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	288 local user, host = arg[1]:match("([^@]+)@(.+)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	289 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	290 show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	291 show_usage [[passwd user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	292 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	293 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	294
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	295 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	299
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	300 if not hosts[host] then
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	301 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	302 show_warning("The user will not be able to log in until this is changed.");
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	303 hosts[host] = make_host(host);
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	304 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	305
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	306 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	307 show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	308 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	309 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	310
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	311 local password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	312 if not password then return 1; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	313
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	314 local ok, msg = prosodyctl.passwd { user = user, host = host, password = password };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	315
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	316 if ok then return 0; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	317
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	318 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	319 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	320 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	321
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	322 function commands.deluser(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	323 if not arg[1] or arg[1] == "--help" then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	324 show_usage([[deluser JID]], [[Permanently remove the specified user account from Prosody]]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	325 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	326 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	327 local user, host = arg[1]:match("([^@]+)@(.+)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	328 if not user and host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	329 show_message [[Failed to understand JID, please supply the JID you want to set the password for]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	330 show_usage [[passwd user@host]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	331 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	332 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	333
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	334 if not host then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	335 show_message [[Please specify a JID, including a host. e.g. alice@example.com]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	336 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	337 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	338
3038 6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	339 if not hosts[host] then
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	340 show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	341 show_warning("The user will not be able to log in until this is changed.");
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	342 hosts[host] = make_host(host);
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	343 end
6b68355d615a prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola) Matthew Wild <mwild1@gmail.com> parents: 3015 diff changeset	344
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	345 if not prosodyctl.user_exists { user = user, host = host } then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	346 show_message [[That user does not exist on this server]]
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	347 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	348 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	349
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	350 local ok, msg = prosodyctl.passwd { user = user, host = host };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	351
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	352 if ok then return 0; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	353
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	354 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	355 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	356 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	357
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	358 function commands.start(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	359 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	360 show_usage([[start]], [[Start Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	361 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	362 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	363 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	364 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	365 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	366 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	367 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	368
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	369 if ret then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	370 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	371 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	372 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	373 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	374 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	375 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	376 show_message("Prosody is already running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	377 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	378 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	379
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	380 local ok, ret = prosodyctl.start();
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	381 if ok then
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	382 if config.get("*", "core", "daemonize") ~= false then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	383 local i=1;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	384 while true do
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	385 local ok, running = prosodyctl.isrunning();
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	386 if ok and running then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	387 break;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	388 elseif i == 5 then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	389 show_message("Still waiting...");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	390 elseif i >= prosodyctl_timeout then
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	391 show_message("Prosody is still not running. Please give it some time or check your log files for errors.");
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	392 return 2;
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	393 end
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	394 socket.sleep(0.5);
a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	395 i = i + 1;
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	396 end
2511 a81c710b1708 prosodyctl: Don't display message about failing to start Prosody is daemonizing is disabled (if daemonizing is disabled then Prosody is stopped by the time control returns to prosodyctl, which then can't see Prosody running) Matthew Wild <mwild1@gmail.com> parents: 2510 diff changeset	397 show_message("Started");
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	398 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	399 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	400 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	401
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	402 show_message("Failed to start Prosody");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	403 show_message(error_messages[ret])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	404 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	405 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	406
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	407 function commands.status(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	408 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	409 show_usage([[status]], [[Reports the running status of Prosody]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	410 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	411 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	412
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	413 local ok, ret = prosodyctl.isrunning();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	414 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	415 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	416 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	417 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	418
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	419 if ret then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	420 local ok, ret = prosodyctl.getpid();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	421 if not ok then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	422 show_message("Couldn't get running Prosody's PID");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	423 show_message(error_messages[ret]);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	424 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	425 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	426 show_message("Prosody is running with PID %s", ret or "(unknown)");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	427 return 0;
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	428 else
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	429 show_message("Prosody is not running");
1115 8a7bc1a5eae6 prosodyctl: status: Show warning if we can't find a running Prosody, and we didn't switch user Matthew Wild <mwild1@gmail.com> parents: 1114 diff changeset	430 if not switched_user and current_uid ~= 0 then
1122 07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	431 print("\nNote:")
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	432 print(" You will also see this if prosodyctl is not running under");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	433 print(" the same user account as Prosody. Try running as root (e.g. ");
07b2b5942957 prosodyctl: Reformat note to fit in small-width terminals Matthew Wild <mwild1@gmail.com> parents: 1120 diff changeset	434 print(" with 'sudo' in front) to gain access to Prosody's real status.");
1115 8a7bc1a5eae6 prosodyctl: status: Show warning if we can't find a running Prosody, and we didn't switch user Matthew Wild <mwild1@gmail.com> parents: 1114 diff changeset	435 end
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	436 return 2
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	437 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	438 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	439 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	440
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	441 function commands.stop(arg)
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	442 if arg[1] == "--help" then
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	443 show_usage([[stop]], [[Stop a running Prosody server]]);
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	444 return 1;
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	445 end
a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	446
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	447 if not prosodyctl.isrunning() then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	448 show_message("Prosody is not running");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	449 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	450 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	451
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	452 local ok, ret = prosodyctl.stop();
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	453 if ok then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	454 local i=1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	455 while true do
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	456 local ok, running = prosodyctl.isrunning();
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	457 if ok and not running then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	458 break;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	459 elseif i == 5 then
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	460 show_message("Still waiting...");
1459 545208bc0e84 prosodyctl: Use prosodyctl_timeout option if it exists in the config Matthew Wild <mwild1@gmail.com> parents: 1458 diff changeset	461 elseif i >= prosodyctl_timeout then
1458 fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	462 show_message("Prosody is still running. Please give it some time or check your log files for errors.");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	463 return 2;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	464 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	465 socket.sleep(0.5);
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	466 i = i + 1;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	467 end
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	468 show_message("Stopped");
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	469 return 0;
fce75b4efda9 prosodyctl: Improve usability with status messages, and waiting up to 5s for the server to start/stop Matthew Wild <mwild1@gmail.com> parents: 1390 diff changeset	470 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	471
1089 a817cbaa0f46 prosodyctl: Multiple fixes for start/status/stop Matthew Wild <mwild1@gmail.com> parents: 1087 diff changeset	472 show_message(error_messages[ret]);
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	473 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	474 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	475
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	476 function commands.restart(arg)
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	477 if arg[1] == "--help" then
2705 8a5af6f14c07 prosodyctl: Fix 'restart' command to not report itself as the 'stop' command (thanks albert!) Matthew Wild <mwild1@gmail.com> parents: 2696 diff changeset	478 show_usage([[restart]], [[Restart a running Prosody server]]);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	479 return 1;
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	480 end
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	481
3846 763df64fdd9d prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	482 commands.stop(arg);
763df64fdd9d prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running Matthew Wild <mwild1@gmail.com> parents: 3630 diff changeset	483 return commands.start(arg);
2696 cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	484 end
cb5acafbec62 prosodyctl: Add restart command for KSid and johnny :) Matthew Wild <mwild1@gmail.com> parents: 2587 diff changeset	485
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	486 -- ejabberdctl compatibility
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	487
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	488 function commands.register(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	489 local user, host, password = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	490 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	491 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	492 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	493 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	494 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	495 show_message [[Please specify which host you want to register the user on]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	496 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	497 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	498 show_usage("register USER HOST [PASSWORD]", "Register a user on the server, with the given password");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	499 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	500 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	501 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	502 password = read_password();
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	503 if not password then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	504 show_message [[Unable to register user with no password]];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	505 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	506 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	507 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	508
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	509 local ok, msg = prosodyctl.adduser { user = user, host = host, password = password };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	510
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	511 if ok then return 0; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	512
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	513 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	514 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	515 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	516
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	517 function commands.unregister(arg)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	518 local user, host = unpack(arg);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	519 if (not (user and host)) or arg[1] == "--help" then
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	520 if user ~= "--help" then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	521 if not user then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	522 show_message [[No username specified]]
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	523 elseif not host then
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	524 show_message [[Please specify which host you want to unregister the user from]];
c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	525 end
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	526 end
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	527 show_usage("unregister USER HOST [PASSWORD]", "Permanently remove a user account from the server");
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	528 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	529 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	530
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	531 local ok, msg = prosodyctl.deluser { user = user, host = host };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	532
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	533 if ok then return 0; end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	534
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	535 show_message(error_messages[msg])
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	536 return 1;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	537 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	538
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	539 ---------------------
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	540
1499 51e3e22b5316 prosodyctl: Fix traceback when issued with no parameters Matthew Wild <mwild1@gmail.com> parents: 1460 diff changeset	541 if command and command:match("^mod_") then -- Is a command in a module
1390 ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	542 local module_name = command:match("^mod_(.+)");
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	543 local ret, err = modulemanager.load("*", module_name);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	544 if not ret then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	545 show_message("Failed to load module '"..module_name.."': "..err);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	546 os.exit(1);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	547 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	548
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	549 table.remove(arg, 1);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	550
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	551 local module = modulemanager.get_module("*", module_name);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	552 if not module then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	553 show_message("Failed to load module '"..module_name.."': Unknown error");
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	554 os.exit(1);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	555 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	556
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	557 if not modulemanager.module_has_method(module, "command") then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	558 show_message("Fail: mod_"..module_name.." does not support any commands");
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	559 os.exit(1);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	560 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	561
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	562 local ok, ret = modulemanager.call_module_method(module, "command", arg);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	563 if ok then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	564 if type(ret) == "number" then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	565 os.exit(ret);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	566 elseif type(ret) == "string" then
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	567 show_message(ret);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	568 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	569 os.exit(0); -- :)
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	570 else
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	571 show_message("Failed to execute command: "..error_messages[ret]);
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	572 os.exit(1); -- :(
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	573 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	574 end
ef672c9fe7c9 prosodyctl: Allow commands to be implemented in modules Matthew Wild <mwild1@gmail.com> parents: 1205 diff changeset	575
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	576 if not commands[command] then -- Show help for all commands
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	577 function show_usage(usage, desc)
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	578 print(" "..usage);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	579 print(" "..desc);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	580 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	581
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	582 print("prosodyctl - Manage a Prosody server");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	583 print("");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	584 print("Usage: "..arg[0].." COMMAND [OPTIONS]");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	585 print("");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	586 print("Where COMMAND may be one of:\n");
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	587
2706 c2dde8bda3fe prosodyctl: Fix addplugin to support --help, and hide from the help listing (for now) Matthew Wild <mwild1@gmail.com> parents: 2705 diff changeset	588 local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
c2dde8bda3fe prosodyctl: Fix addplugin to support --help, and hide from the help listing (for now) Matthew Wild <mwild1@gmail.com> parents: 2705 diff changeset	589 local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	590
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	591 local done = {};
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	592
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	593 for _, command_name in ipairs(commands_order) do
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	594 local command = commands[command_name];
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	595 if command then
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	596 command{ "--help" };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	597 print""
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	598 done[command_name] = true;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	599 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	600 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	601
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	602 for command_name, command in pairs(commands) do
1102 c81df501fd38 prosodyctl: Hide ejabberd compatibility commands from command listing Matthew Wild <mwild1@gmail.com> parents: 1089 diff changeset	603 if not done[command_name] and not hidden_commands:contains(command_name) then
1087 5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	604 command{ "--help" };
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	605 print""
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	606 done[command_name] = true;
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	607 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	608 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	609
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	610
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	611 os.exit(0);
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	612 end
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	613
5e9475bec571 prosodyctl, util.prosodyctl: New prosodyctl utility for managing Prosody servers Matthew Wild <mwild1@gmail.com> parents: diff changeset	614 os.exit(commands[command]({ select(2, unpack(arg)) }));

prosody

6811a229d92c

prosodyctl

Software / code / prosody

Annotate

prosodyctl @ 4195:6811a229d92c

Software `/` code `/` prosody