diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-05-01 05:18:38 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-05-01 05:18:38 +0500 |
| commit | 3376282d8aacc5814519e16c8b04809f24b9f248 (patch) | |
| tree | 7e5980dff5518468ef2d7f18b66f4826b5ab62e9 /core/configmanager.lua | |
| parent | 2d68866021180ac35c77b6022e717bc727280177 (diff) | |
| parent | 170a2e9b64199f9a72976f5e24556d30c851192e (diff) | |
| download | prosody-3376282d8aacc5814519e16c8b04809f24b9f248.tar.gz prosody-3376282d8aacc5814519e16c8b04809f24b9f248.zip | |
Merge 0.6 into 0.7.
Diffstat (limited to 'core/configmanager.lua')
| -rw-r--r-- | core/configmanager.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index e7677df6..54fb0a9a 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -112,7 +112,7 @@ do function parsers.lua.load(data, filename) local env; -- The ' = true' are needed so as not to set off __newindex when we assign the functions below - env = setmetatable({ Host = true; host = true; Component = true, component = true, + env = setmetatable({ Host = true, host = true, VirtualHost = true, Component = true, component = true, Include = true, include = true, RunScript = dofile }, { __index = function (t, k) return rawget(_G, k) or function (settings_table) @@ -124,7 +124,7 @@ do end}); rawset(env, "__currenthost", "*") -- Default is global - function env.Host(name) + function env.VirtualHost(name) if rawget(config, name) and rawget(config[name].core, "component_module") then error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s", name, config[name].core.component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0); @@ -133,7 +133,7 @@ do -- Needs at least one setting to logically exist :) set(name or "*", "core", "defined", true); end - env.host = env.Host; + env.Host, env.host = env.VirtualHost, env.VirtualHost; function env.Component(name) if rawget(config, name) and rawget(config[name].core, "defined") and not rawget(config[name].core, "component_module") then |