aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody25
1 files changed, 11 insertions, 14 deletions
diff --git a/prosody b/prosody
index b9e927fb..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
@@ -133,7 +130,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