Yes, we don't put these things in here, we put them in here.

[prosody.git] / main.lua

diff --git a/main.lua b/main.lua
index ec883234d53881c8b05f151f08b62c42ec745b0c..1513763e4453f7b9292416b72f657d1c84eee589 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -1,25 +1,44 @@
 pcall(require, "luarocks.require")
 
-local server = require "net.server"
-require "lxp"
-require "socket"
-require "ssl"
+local config = require "core.configmanager"
+log = require "util.logger".init("general");
 
-function log(type, area, message)
-       print(type, area, message);
+do
+       -- TODO: Check for other formats when we add support for them
+       -- Use lfs? Make a new conf/ dir?
+       local ok, err = config.load("lxmppd.cfg.lua");
+       if not ok then
+               log("error", "Couldn't load config file: %s", err);
+               log("info", "Falling back to old config file format...")
+               ok, err = pcall(dofile, "lxmppd.cfg");
+               if not ok then
+                       log("error", "Old config format loading failed too: %s", err);
+               else
+                       for _, host in ipairs(_G.config.hosts) do
+                               config.set(host, "core", "defined", true);
+                       end
+                       
+                       config.set("*", "core", "modules_enabled", _G.config.modules);
+                       config.set("*", "core", "ssl", _G.config.ssl_ctx);
+               end
+       end
 end
 
-dofile "lxmppd.cfg"
+local server = require "net.server"
+
+require "util.dependencies"
 
 -- Maps connections to sessions --
 sessions = {};
 hosts = {};
 
-if config.hosts and #config.hosts > 0 then
-       for _, host in pairs(config.hosts) do
-               hosts[host] = {type = "local", connected = true, sessions = {}};
+local defined_hosts = config.getconfig();
+
+for host, host_config in pairs(defined_hosts) do
+       if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then
+               hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
        end
-else error("No hosts defined in the configuration file"); end
+end
 
 -- Load and initialise core modules --
 
@@ -32,6 +51,11 @@ require "core.usermanager"
 require "core.sessionmanager"
 require "core.stanza_router"
 
+--[[
+pcall(require, "remdebug.engine");
+if remdebug then remdebug.engine.start() end
+]]
+
 local start = require "net.connlisteners".start;
 require "util.stanza"
 require "util.jid"
@@ -39,11 +63,12 @@ require "util.jid"
 ------------------------------------------------------------------------
 
 -- Initialise modules
-if config.modules and #config.modules > 0 then
-       for _, module in pairs(config.modules) do
+local modules_enabled = config.get("*", "core", "modules_enabled");
+if modules_enabled then
+       for _, module in pairs(modules_enabled) do
                modulemanager.load(module);
        end
-else error("No modules enabled in the configuration file"); end
+end
 
 -- setup error handling
 setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][];
@@ -51,8 +76,21 @@ setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A N
 local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end;
 local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end;
 
+
+local global_ssl_ctx = config.get("*", "core", "ssl");
+if global_ssl_ctx then
+       local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
+       setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
+end
+
 -- start listening on sockets
-start("xmppclient", { ssl = config.ssl_ctx })
-start("xmppserver", { ssl = config.ssl_ctx })
+start("xmppclient", { ssl = global_ssl_ctx })
+start("xmppserver", { ssl = global_ssl_ctx })
+
+if config.get("*", "core", "console_enabled") then
+       start("console")
+end
+
+modulemanager.fire_event("server-started");
 
 server.loop();