diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-04-14 12:59:46 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-04-14 12:59:46 +0100 |
| commit | 61d1f2e0481cdbaa7367bb0448200000ff77439c (patch) | |
| tree | 4140ee2c57bbf7e3100d697205bf7c789f981b3a | |
| parent | fe97859d274301e014cf8fc137cb8688075cc195 (diff) | |
| download | prosody-61d1f2e0481cdbaa7367bb0448200000ff77439c.tar.gz prosody-61d1f2e0481cdbaa7367bb0448200000ff77439c.zip | |
configmanager: Add VirtualHost as an alias for Host
| -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 b974d2f2..6350d80b 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -103,7 +103,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) @@ -115,7 +115,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); @@ -124,7 +124,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 |