Mercurial > prosody-hg

comparison core/configmanager.lua @ 7950:f91e7ec9654e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 01:14:32 +0100
parents 24170d74b00b
children c22d5680ca68
comparison
equal deleted inserted replaced
7946:c92102fe409b 7950:f91e7ec9654e
156 end 156 end
157 env.Host, env.host = env.VirtualHost, env.VirtualHost; 157 env.Host, env.host = env.VirtualHost, env.VirtualHost;
158 158
159 function env.Component(name) 159 function env.Component(name)
160 name = nameprep(name); 160 name = nameprep(name);
161 if rawget(config_table, name) and rawget(config_table[name], "defined") and not rawget(config_table[name], "component_module") then 161 if rawget(config_table, name) and rawget(config_table[name], "defined")
162 and not rawget(config_table[name], "component_module") then
162 error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s", 163 error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
163 name, name, name), 0); 164 name, name, name), 0);
164 end 165 end
165 set(config_table, name, "component_module", "component"); 166 set(config_table, name, "component_module", "component");
166 -- Don't load the global modules by default 167 -- Don't load the global modules by default