X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=ee2baca500062bb3b5bf293ce1b65810b9d9cbbe;hb=895e5a0a04147733cadee962563cf5e482ada529;hp=9a88eac0b227e65406608276a3f4e861fe78ef94;hpb=b11cb25a07602b016eedf79d238a8ce5e9b3c161;p=prosody.git

diff --git a/prosody b/prosody
index 9a88eac0..ee2baca5 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));