end
end
--- Global 'prosody' object
-prosody = {
- hosts = {},
- events = require "util.events".new(),
- platform = "posix"
-};
-local prosody = prosody;
-
config = require "core.configmanager"
do
os.exit(1);
end
+prosody = { hosts = {}, events = events, platform = "posix" };
+
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
require "util.datamanager".set_data_path(data_path);
["not-running"] = "Prosody is not running";
}, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
-hosts = prosody.hosts;
+local events = require "util.events".new();
-local function make_host(hostname)
- return { events = prosody.events, users = require "core.usermanager".new_default_provider(hostname) };
-end
+hosts = prosody.hosts;
for hostname, config in pairs(config.getconfig()) do
- hosts[hostname] = make_host(hostname);
+ hosts[hostname] = { events = events };
end
require "core.modulemanager"
return 1;
end
- if not hosts[host] then
- show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
- show_warning("The user will not be able to log in until this is changed.");
- hosts[host] = make_host(host);
- elseif config.get(host, "core", "authentication")
- and config.get(host, "core", "authentication") ~= "default" then
- show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
- config.get(host, "core", "authentication"));
- show_warning("prosodyctl currently only supports the default provider, sorry :(");
- return 1;
- end
-
if prosodyctl.user_exists{ user = user, host = host } then
show_message [[That user already exists]];
return 1;
end
+ if not hosts[host] then
+ show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
+ show_warning("The user will not be able to log in until this is changed.");
+ end
+
local password = read_password();
if not password then return 1; end
return 1;
end
- if not hosts[host] then
- show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
- show_warning("The user will not be able to log in until this is changed.");
- hosts[host] = make_host(host);
- elseif config.get(host, "core", "authentication")
- and config.get(host, "core", "authentication") ~= "default" then
- show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
- config.get(host, "core", "authentication"));
- show_warning("prosodyctl currently only supports the default provider, sorry :(");
- return 1;
- end
-
if not prosodyctl.user_exists { user = user, host = host } then
show_message [[That user does not exist, use prosodyctl adduser to create a new user]]
return 1;
return 1;
end
- if not hosts[host] then
- show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
- show_warning("The user will not be able to log in until this is changed.");
- hosts[host] = make_host(host);
- elseif config.get(host, "core", "authentication")
- and config.get(host, "core", "authentication") ~= "default" then
- show_warning("The host '%s' is configured to use the '%s' authentication provider", host,
- config.get(host, "core", "authentication"));
- show_warning("prosodyctl currently only supports the default provider, sorry :(");
- return 1;
- end
-
if not prosodyctl.user_exists { user = user, host = host } then
show_message [[That user does not exist on this server]]
return 1;
return 1;
end
-local http_errors = {
- [404] = "Plugin not found, did you type the address correctly?"
- };
-
-function commands.addplugin(arg)
- if not arg[1] or arg[1] == "--help" then
- show_usage("addplugin URL", "Download and install a plugin from a URL");
- return 1;
- end
- local url = arg[1];
- if url:match("^http://") then
- local http = require "socket.http";
- show_message("Fetching...");
- local code, err = http.request(url);
- if not code or not tostring(err):match("^[23]") then
- show_message("Failed: "..(http_errors[err] or ("HTTP error "..err)));
- return 1;
- end
- if url:match("%.lua$") then
- local ok, err = datamanager.store(url:match("/mod_([^/]+)$"), "*", "plugins", {code});
- if not ok then
- show_message("Failed to save to data store: "..err);
- return 1;
- end
- end
- show_message("Saved. Don't forget to load the module using the config file or admin console!");
- else
- show_message("Sorry, I don't understand how to fetch plugins from there.");
- end
-end
-
---------------------
if command and command:match("^mod_") then -- Is a command in a module