Mercurial > prosody-hg

comparison main.lua @ 454:21105a005eef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from waqas
author Matthew Wild <mwild1@gmail.com>
date Fri, 28 Nov 2008 18:06:29 +0000
parents 613c5c6bdce4
children
comparison
equal deleted inserted replaced
451:e9f269e5204e 454:21105a005eef
21 config.set("*", "core", "modules_enabled", _G.config.modules); 21 config.set("*", "core", "modules_enabled", _G.config.modules);
22 config.set("*", "core", "ssl", _G.config.ssl_ctx); 22 config.set("*", "core", "ssl", _G.config.ssl_ctx);
23 end 23 end
24 end 24 end
25 end 25 end
26
27 require "util.datamanager".set_data_path(config.get("*", "core", "data_path") or "data");
26 28
27 local server = require "net.server" 29 local server = require "net.server"
28 30
29 require "util.dependencies" 31 require "util.dependencies"
30 32