X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fhostmanager.lua;h=9e74cd6bb5cdf0f5090381f3ce30bda3321b4df2;hb=893e9d4df9981fa666c98c0f5dd04920ae91e955;hp=445ef0fb10eedfc67b6262c5ed86fd02536d6926;hpb=55246e049bb002952db0f2058328031b29c3853c;p=prosody.git

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 445ef0fb..9e74cd6b 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -24,6 +24,7 @@ end
 local incoming_s2s = _G.prosody.incoming_s2s;
 
 local pairs, setmetatable = pairs, setmetatable;
+local tostring, type = tostring, type;
 
 module "hostmanager"
 
@@ -53,7 +54,9 @@ end
 prosody_events.add_handler("server-starting", load_enabled_hosts);
 
 function activate(host, host_config)
-	if hosts[host] then return nil, "host-already-exists"; end
+	if hosts[host] then return nil, "The host "..host.." is already activated"; end
+	host_config = host_config or configmanager.getconfig()[host];
+	if not host_config then return nil, "Couldn't find the host "..tostring(host).." defined in the current config"; end
 	local host_session = {
 		host = host;
 		s2sout = {};
@@ -64,14 +67,13 @@ function activate(host, host_config)
 	if not host_config.core.component_module then -- host
 		host_session.type = "local";
 		host_session.sessions = {};
-		if configmanager.get(host, "core", "anonymous_login") then
-			host_session.disallow_s2s = (configmanager.get(host, "core", "disallow_s2s") ~= false);
-		end
 	else -- component
 		host_session.type = "component";
 	end
 	hosts[host] = host_session;
-	disco_items:set(host:match("%.(.*)") or "*", host, true);
+	if not host:match("[@/]") then
+		disco_items:set(host:match("%.(.*)") or "*", host, true);
+	end
 	for option_name in pairs(host_config.core) do
 		if option_name:match("_ports$") or option_name:match("_interface$") then
 			log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);
@@ -85,10 +87,13 @@ end
 
 function deactivate(host, reason)
 	local host_session = hosts[host];
+	if not host_session then return nil, "The host "..tostring(host).." is not activated"; end
 	log("info", "Deactivating host: %s", host);
 	prosody_events.fire_event("host-deactivating", host, host_session);
 	
-	reason = reason or { condition = "host-gone", text = "This server has stopped serving "..host };
+	if type(reason) ~= "table" then
+		reason = { condition = "host-gone", text = tostring(reason or "This server has stopped serving "..host) };
+	end
 	
 	-- Disconnect local users, s2s connections
 	if host_session.sessions then
@@ -122,9 +127,12 @@ function deactivate(host, reason)
 	end
 
 	hosts[host] = nil;
-	disco_items:remove(host:match("%.(.*)") or "*", host);
+	if not host:match("[@/]") then
+		disco_items:remove(host:match("%.(.*)") or "*", host);
+	end
 	prosody_events.fire_event("host-deactivated", host);
 	log("info", "Deactivated host: %s", host);
+	return true;
 end
 
 function get_children(host)