X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=4b016e504e3d9c60c60670704027c2ba8f6f974e;hb=60dae87af22cdc7fae469b43f91bc1eb6ea992a2;hp=2f60181efec995abc488c9c64ec4a5d8dbb7cca1;hpb=352d7c5d891568f3da81a533297a2924af5e8811;p=prosody.git

diff --git a/prosody b/prosody
index 2f60181e..4b016e50 100755
--- a/prosody
+++ b/prosody
@@ -22,9 +22,6 @@ if CFG_SOURCEDIR then
 	package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
-package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
-package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
-
 -- Substitute ~ with path to home directory in data path
 if CFG_DATADIR then
 	if os.getenv("HOME") then
@@ -232,8 +229,12 @@ function init_global_state()
 						elseif err:match("permission") then
 							friendly_message = "Prosody does not have sufficient privileges to use this port";
 						elseif err == "no ssl context" then
-							friendly_message = "there is no 'ssl' config under Host \"*\" which is "
-								.."require for legacy SSL ports";
+							if not config.get("*", "core", "ssl") then
+								friendly_message = "there is no 'ssl' config under Host \"*\" which is "
+									.."require for legacy SSL ports";
+							else
+								friendly_message = "initializing SSL support failed, see previous log entries";
+							end
 						end
 						log("error", "Failed to open server port %d, %s", port, friendly_message);
 					end
@@ -304,7 +305,7 @@ function init_data_store()
 end
 
 function prepare_to_start()
-	log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
+	log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
 	-- Signal to modules that we are ready to start
 	eventmanager.fire_event("server-starting");
 	prosody.events.fire_event("server-starting");