X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=197446e639e83a275855531bed9a73fdbd141a6c;hb=1b527ae5e85f5dd5e31c240aea8d48c23a56ab25;hp=9fd5e4ff6c00c31409d8e909f6bf050a5e55d1a2;hpb=015433da802e1fd70cd9384aef337b57fbcd03b5;p=prosody.git diff --git a/prosody b/prosody index 9fd5e4ff..197446e6 100755 --- a/prosody +++ b/prosody @@ -1,25 +1,12 @@ #!/usr/bin/env lua --- Prosody IM v0.1 --- Copyright (C) 2008 Matthew Wild --- Copyright (C) 2008 Waqas Hussain +-- Prosody IM v0.3 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain -- --- This program is free software; you can redistribute it and/or --- modify it under the terms of the GNU General Public License --- as published by the Free Software Foundation; either version 2 --- of the License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. -- - - -- Config here -- CFG_SOURCEDIR=nil; @@ -47,44 +34,49 @@ pcall(require, "luarocks.require") config = require "core.configmanager" log = require "util.logger".init("general"); +-- Disable log output, needs to read from config +-- require "util.logger".setwriter(function () end); + do -- TODO: Check for other formats when we add support for them -- Use lfs? Make a new conf/ dir? - local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.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); + print(""); + print("**************************"); + if level == "parser" then + print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); + print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err))); + print(""); + elseif level == "file" then + print("Prosody was unable to find the configuration file."); + print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); + print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist"); + print("Copy or rename it to prosody.cfg.lua and edit as necessary."); end + print("More help on configuring Prosody can be found at http://prosody.im/doc/configure"); + print("Good luck!"); + print("**************************"); + print(""); + os.exit(1); end end -require "util.datamanager".set_data_path(data_path); +require "util.dependencies" local server = require "net.server" -require "util.dependencies" -- Maps connections to sessions -- sessions = {}; hosts = {}; - -- Load and initialise core modules -- require "util.import" require "core.xmlhandlers" require "core.rostermanager" -require "core.offlinemessage" require "core.eventmanager" require "core.hostmanager" require "core.modulemanager" @@ -104,56 +96,19 @@ require "util.jid" ------------------------------------------------------------------------ + ------------- Begin code without a home --------------------- local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - --print("mkdir",path); - local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); - -eventmanager.add_event_hook("host-activated", mkdirs); +require "util.datamanager".set_data_path(data_path); ----------- End of out-of-place code -------------- eventmanager.fire_event("server-starting"); --- Initialise modules - -for host in pairs(hosts) do - if host ~= "*" then - local modules_enabled = config.get(host, "core", "modules_enabled"); - if modules_enabled then - for _, module in pairs(modules_enabled) do - modulemanager.load(host, module); - end - end - 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 }) --]][][[]][]; - -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; - +setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }); local global_ssl_ctx = config.get("*", "core", "ssl"); if global_ssl_ctx then @@ -162,12 +117,30 @@ if global_ssl_ctx then end -- start listening on sockets -cl.start("xmppclient", { ssl = global_ssl_ctx }) -cl.start("xmppserver", { ssl = global_ssl_ctx }) +local function do_ports(option, listener, default, conntype) + local ports = config.get("*", "core", option) or default; + --if type(ports) == "number" then ports = {ports} end; + + if type(ports) ~= "table" then + log("error", "core."..option.." is not a table"); + else + for _, port in ipairs(ports) do + if type(port) ~= "number" then + log("error", "Non-numeric "..option..": "..tostring(port)); + else + cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype }); + end + end + end +end + +do_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); +do_ports("s2s_ports", "xmppserver", {5269}, "tcp"); +do_ports("legacy_ssl_ports", "xmppclient", {}, "ssl"); if config.get("*", "core", "console_enabled") then if cl.get("console") then - cl.start("console") + cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) else log("error", "Console is enabled, but the console module appears not to be loaded"); end