aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-12-09 21:11:12 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-12-09 21:11:12 +0500
commit1b1f622cd24777f63d0cc100ab6dfe28e0ca6cdb (patch)
tree3299288e344c5254e881212bbc6fbe1264b4df89 /core
parentff99ebb6045e126c16027d2cccf3d7fb1ed7af1c (diff)
downloadprosody-1b1f622cd24777f63d0cc100ab6dfe28e0ca6cdb.tar.gz
prosody-1b1f622cd24777f63d0cc100ab6dfe28e0ca6cdb.zip
hostmanager: activate() now gets the host config from configmanager when a config isn't given.
Diffstat (limited to 'core')
-rw-r--r--core/hostmanager.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 9a5b2728..fddf1769 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -54,6 +54,7 @@ prosody_events.add_handler("server-starting", load_enabled_hosts);
function activate(host, host_config)
if hosts[host] then return nil, "host-already-exists"; end
+ host_config = host_config or configmanager.getconfig()[host];
local host_session = {
host = host;
s2sout = {};