X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosodyctl;h=74dade5f53858bbc2b62fa421bee18c7fc916b90;hb=9f89e636a73c1291918a9d9c13f0e61cc9e08eb4;hp=70474900f3ea1593299d2a8e3b9b5118ddb828b2;hpb=332ebda71d7fa4771a8222664b3b8bf341109432;p=prosody.git

diff --git a/prosodyctl b/prosodyctl
index 70474900..74dade5f 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -29,11 +29,13 @@ if CFG_DATADIR then
 	end
 end
 
-require "core.loggingmanager"
-
-if not require "util.dependencies".check_dependencies() then
-	os.exit(1);
-end
+-- Global 'prosody' object
+prosody = {
+	hosts = {},
+	events = require "util.events".new(),
+	platform = "posix"
+};
+local prosody = prosody;
 
 config = require "core.configmanager"
 
@@ -62,8 +64,14 @@ do
 		os.exit(1);
 	end
 end
+local original_logging_config = config.get("*", "core", "log");
+config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
 
-prosody = { hosts = {}, events = events, platform = "posix" };
+require "core.loggingmanager"
+
+if not require "util.dependencies".check_dependencies() then
+	os.exit(1);
+end
 
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 require "util.datamanager".set_data_path(data_path);
@@ -71,7 +79,7 @@ require "util.datamanager".set_data_path(data_path);
 -- Switch away from root and into the prosody user --
 local switched_user, current_uid;
 
-local want_pposix_version = "0.3.3";
+local want_pposix_version = "0.3.5";
 local ok, pposix = pcall(require, "util.pposix");
 
 if ok and pposix then
@@ -82,6 +90,9 @@ if ok and pposix then
 		local desired_user = config.get("*", "core", "prosody_user") or "prosody";
 		local desired_group = config.get("*", "core", "prosody_group") or desired_user;
 		local ok, err = pposix.setgid(desired_group);
+		if ok then
+			ok, err = pposix.initgroups(desired_user);
+		end
 		if ok then
 			ok, err = pposix.setuid(desired_user);
 			if ok then
@@ -103,6 +114,45 @@ else
 	print(tostring(pposix))
 end
 
+local function test_writeable(filename)
+	local f, err = io.open(filename, "a");
+	if not f then
+		return false, err;
+	end
+	f:close();
+	return true;
+end
+
+local unwriteable_files = {};
+if type(original_logging_config) == "string" and original_logging_config:sub(1,1) ~= "*" then
+	local ok, err = test_writeable(original_logging_config);
+	if not ok then
+		table.insert(unwriteable_files, err);
+	end
+elseif type(original_logging_config) == "table" then
+	for _, rule in ipairs(original_logging_config) do
+		if rule.filename then
+			local ok, err = test_writeable(rule.filename);
+			if not ok then
+				table.insert(unwriteable_files, err);
+			end
+		end
+	end
+end
+
+if #unwriteable_files > 0 then
+	print("One of more of the Prosody log files are not");
+	print("writeable, please correct the errors and try");
+	print("starting prosodyctl again.");
+	print("");
+	for _, err in ipairs(unwriteable_files) do
+		print(err);
+	end
+	print("");
+	os.exit(1);
+end
+
+
 local error_messages = setmetatable({ 
 		["invalid-username"] = "The given username is invalid in a Jabber ID";
 		["invalid-hostname"] = "The given hostname is invalid";
@@ -114,12 +164,14 @@ local error_messages = setmetatable({
 		["not-running"] = "Prosody is not running";
 		}, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end });
 
-local events = require "util.events".new();
-
 hosts = prosody.hosts;
 
+local function make_host(hostname)
+	return { events = prosody.events, users = require "core.usermanager".new_null_provider(hostname) };
+end
+
 for hostname, config in pairs(config.getconfig()) do
-	hosts[hostname] = { events = events };
+	hosts[hostname] = make_host(hostname);
 end
 	
 require "core.modulemanager"
@@ -231,14 +283,15 @@ function commands.adduser(arg)
 		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.");
+		hosts[host] = make_host(host);
+	end
+	
+	if prosodyctl.user_exists{ user = user, host = host } then
+		show_message [[That user already exists]];
+		return 1;
 	end
 	
 	local password = read_password();
@@ -269,6 +322,12 @@ function commands.passwd(arg)
 		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);
+	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;
@@ -302,6 +361,12 @@ function commands.deluser(arg)
 		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);
+	end
+
 	if not prosodyctl.user_exists { user = user, host = host } then
 		show_message [[That user does not exist on this server]]
 		return 1;
@@ -433,6 +498,19 @@ function commands.stop(arg)
 	return 1;
 end
 
+function commands.restart(arg)
+	if arg[1] == "--help" then
+		show_usage([[restart]], [[Restart a running Prosody server]]);
+		return 1;
+	end
+	
+	local ret = commands.stop(arg);
+	if ret == 0 then
+		ret = commands.start(arg);
+	end
+	return ret;
+end
+
 -- ejabberdctl compatibility
 
 function commands.register(arg)
@@ -486,33 +564,6 @@ function commands.unregister(arg)
 	return 1;
 end
 
-local http_errors = {
-	[404] = "Plugin not found, did you type the address correctly?"
-	};
-
-function commands.addplugin(arg)
-	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
@@ -562,8 +613,8 @@ if not commands[command] then -- Show help for all commands
 	print("");
 	print("Where COMMAND may be one of:\n");
 
-	local hidden_commands = require "util.set".new{ "register", "unregister" };
-	local commands_order = { "adduser", "passwd", "deluser" };
+	local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
+	local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
 
 	local done = {};