diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-04 23:36:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-04 23:36:50 +0100 |
| commit | bb00df3f5e95d57c7dff489c5a3da1b292251f85 (patch) | |
| tree | f77f1673a20e30d53488924ed31f2e8d286a78f1 /core/hostmanager.lua | |
| parent | f050b618466ad7d6008fc96d3860c0ad868af7e8 (diff) | |
| parent | 3376282d8aacc5814519e16c8b04809f24b9f248 (diff) | |
| download | prosody-bb00df3f5e95d57c7dff489c5a3da1b292251f85.tar.gz prosody-bb00df3f5e95d57c7dff489c5a3da1b292251f85.zip | |
Merge 0.7->trunk (with MUC needing checking, waqas)
Diffstat (limited to 'core/hostmanager.lua')
| -rw-r--r-- | core/hostmanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua index eb880449..c8928b27 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -42,7 +42,7 @@ local function load_enabled_hosts(config) end if not activated_any_host then - log("error", "No hosts defined in the config file. This may cause unexpected behaviour as no modules will be loaded."); + log("error", "No active VirtualHost entries in the config file. This may cause unexpected behaviour as no modules will be loaded."); end eventmanager.fire_event("hosts-activated", defined_hosts); @@ -60,8 +60,8 @@ function activate(host, host_config) dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(); }; for option_name in pairs(host_config.core) do - if option_name:match("_ports$") then - log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name); + 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); end end |