X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=b411370fb1f0b63e4d8ed0f9d7c24061525c8545;hb=11e4e463d490667a1ad5dba30ebdc4325a5211c4;hp=9a88eac0b227e65406608276a3f4e861fe78ef94;hpb=bca9d41c435fcce947eb9ee166efae96becbac5f;p=prosody.git

diff --git a/prosody b/prosody
index 9a88eac0..b411370f 100755
--- a/prosody
+++ b/prosody
@@ -86,6 +86,7 @@ function read_config()
 			break;
 		end
 	end
+	prosody.config_file = filename
 	local ok, level, err = config.load(filename);
 	if not ok then
 		print("\n");
@@ -240,7 +241,7 @@ function init_global_state()
 	function prosody.reload_config()
 		log("info", "Reloading configuration file");
 		prosody.events.fire_event("reloading-config");
-		local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
+		local ok, level, err = config.load(prosody.config_file);
 		if not ok then
 			if level == "parser" then
 				log("error", "There was an error parsing the configuration file: %s", tostring(err));
@@ -264,12 +265,6 @@ function init_global_state()
 		prosody.events.fire_event("server-stopping", {reason = reason});
 		server.setquitting(true);
 	end
-
-	-- Load SSL settings from config, and create a ctx table
-	local certmanager = require "core.certmanager";
-	local global_ssl_ctx = certmanager.create_context("*", "server");
-	prosody.global_ssl_ctx = global_ssl_ctx;
-
 end
 
 function read_version()