Changeset

--- a/core/storagemanager.lua	Sun Sep 23 01:11:20 2012 +0500
+++ b/core/storagemanager.lua	Sun Sep 23 01:13:08 2012 +0500
@@ -96,7 +96,6 @@
 
 function purge(user, host)
 	local storage = config.get(host, "storage");
-	local driver_name;
 	if type(storage) == "table" then
 		-- multiple storage backends in use that we need to purge
 		local purged = {};
@@ -123,7 +122,7 @@
 	return get_driver(host):stores(username, typ);
 end
 function datamanager.purge(username, host)
-	return purge(username);
+	return purge(username, host);
 end
 
 return _M;

--- a/plugins/mod_admin_adhoc.lua	Sun Sep 23 01:11:20 2012 +0500
+++ b/plugins/mod_admin_adhoc.lua	Sun Sep 23 01:13:08 2012 +0500
@@ -17,6 +17,8 @@
 local usermanager_delete_user = require "core.usermanager".delete_user;
 local usermanager_get_password = require "core.usermanager".get_password;
 local usermanager_set_password = require "core.usermanager".set_password;
+local hostmanager_activate = require "core.hostmanager".activate;
+local hostmanager_deactivate = require "core.hostmanager".deactivate;
 local is_admin = require "core.usermanager".is_admin;
 local rm_load_roster = require "core.rostermanager".load_roster;
 local st, jid, uuid = require "util.stanza", require "util.jid", require "util.uuid";
@@ -606,6 +608,63 @@
 	end
 end
 
+function activate_host_handler(self, data, state)
+	local layout = dataforms_new {
+		title = "Activate host";
+		instructions = "";
+
+		{ name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
+		{ name = "host", type = "text-single", required = true, label = "Host:"};
+	};
+	if state then
+		if data.action == "cancel" then
+			return { status = "canceled" };
+		end
+		local fields, err = layout:data(data.form);
+		if err then
+			return generate_error_message(err);
+		end
+		local ok, err = hostmanager_activate(fields.host);
+
+		if ok then
+			return { status = "completed", info = fields.host .. " activated" };
+		else
+			return { status = "canceled", error = err }
+		end
+	else
+		return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout } }, "executing";
+	end
+end
+
+function deactivate_host_handler(self, data, state)
+	local layout = dataforms_new {
+		title = "Deactivate host";
+		instructions = "";
+
+		{ name = "FORM_TYPE", type = "hidden", value = "http://prosody.im/protocol/hosts#activate" };
+		{ name = "host", type = "text-single", required = true, label = "Host:"};
+	};
+	if state then
+		if data.action == "cancel" then
+			return { status = "canceled" };
+		end
+		local fields, err = layout:data(data.form);
+		if err then
+			return generate_error_message(err);
+		end
+		local ok, err = hostmanager_deactivate(fields.host);
+
+		if ok then
+			return { status = "completed", info = fields.host .. " deactivated" };
+		else
+			return { status = "canceled", error = err }
+		end
+	else
+		return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout } }, "executing";
+	end
+end
+
+
 local add_user_desc = adhoc_new("Add User", "http://jabber.org/protocol/admin#add-user", add_user_command_handler, "admin");
 local change_user_password_desc = adhoc_new("Change User Password", "http://jabber.org/protocol/admin#change-user-password", change_user_password_command_handler, "admin");
 local config_reload_desc = adhoc_new("Reload configuration", "http://prosody.im/protocol/config#reload", config_reload_handler, "global_admin");
@@ -620,6 +679,8 @@
 local reload_modules_desc = adhoc_new("Reload modules", "http://prosody.im/protocol/modules#reload", reload_modules_handler, "admin");
 local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "global_admin");
 local unload_modules_desc = adhoc_new("Unload modules", "http://prosody.im/protocol/modules#unload", unload_modules_handler, "admin");
+local activate_host_desc = adhoc_new("Activate host", "http://prosody.im/protocol/hosts#activate", activate_host_handler, "global_admin");
+local deactivate_host_desc = adhoc_new("Deactivate host", "http://prosody.im/protocol/hosts#deactivate", deactivate_host_handler, "global_admin");
 
 module:provides("adhoc", add_user_desc);
 module:provides("adhoc", change_user_password_desc);
@@ -635,3 +696,5 @@
 module:provides("adhoc", reload_modules_desc);
 module:provides("adhoc", shut_down_service_desc);
 module:provides("adhoc", unload_modules_desc);
+module:provides("adhoc", activate_host_desc);
+module:provides("adhoc", deactivate_host_desc);

--- a/prosodyctl	Sun Sep 23 01:11:20 2012 +0500
+++ b/prosodyctl	Sun Sep 23 01:13:08 2012 +0500
@@ -161,10 +161,12 @@
 	
 	-- Set our umask to protect data files
 	pposix.umask(config.get("*", "core", "umask") or "027");
+	pposix.setenv("HOME", data_path);
 else
 	print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
 	print("For more help send the below error to us through http://prosody.im/discuss");
 	print(tostring(pposix))
+	os.exit(1);
 end
 
 local function test_writeable(filename)
@@ -685,11 +687,13 @@
 		if ask_overwrite(key_filename) then
 			return nil, key_filename;
 		end
-		os.remove(key_filename); -- We chmod this file to not have write permissions
+		os.remove(key_filename); -- This file, if it exists is unlikely to have write permissions
 		local key_size = tonumber(arg[2] or show_prompt("Choose key size (2048):") or 2048);
+		local old_umask = pposix.umask("0377");
 		if openssl.genrsa{out=key_filename, key_size} then
 			os.execute(("chmod 400 '%s'"):format(key_filename));
 			show_message("Key written to ".. key_filename);
+			pposix.umask(old_umask);
 			return nil, key_filename;
 		end
 		show_message("There was a problem, see OpenSSL output");
@@ -721,7 +725,7 @@
 	if #arg >= 1 and arg[1] ~= "--help" then
 		local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cert";
 		if ask_overwrite(cert_filename) then
-			return nil, conf_filename;
+			return nil, cert_filename;
 		end
 		local _, key_filename = cert_commands.key({arg[1]});
 		local _, conf_filename = cert_commands.config(arg);