From c0dbcb4389fa5470c9fc7f674fc7fa698b693c02 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 17 Jan 2009 04:45:08 +0000 Subject: Port to new server.lua, quite some changes, but I believe everything to be working --- prosody | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'prosody') diff --git a/prosody b/prosody index b9e927fb..2c601adb 100755 --- a/prosody +++ b/prosody @@ -133,7 +133,7 @@ local function do_ports(option, listener, default, conntype) if type(port) ~= "number" then log("error", "Non-numeric "..option..": "..tostring(port)); else - cl.start(listener, { ssl = global_ssl_ctx, port = port, type = conntype }); + cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype }); end end end -- cgit v1.2.3 From c6d1ca9ce2d52e19659b1c6a84a2c031f7247152 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 22 Jan 2009 14:39:40 +0000 Subject: Friendlier message when config file not found --- prosody | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'prosody') diff --git a/prosody b/prosody index 2c601adb..3bec8a6c 100755 --- a/prosody +++ b/prosody @@ -53,19 +53,16 @@ do -- Use lfs? Make a new conf/ dir? local ok, 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); - end + print(""); + print("**************************"); + 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."); + print("More help on configuring Prosody can be found at http://prosody.im/doc/configure"); + print("Good luck!"); + print("**************************"); + os.exit(1); end end -- cgit v1.2.3