X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=b411370fb1f0b63e4d8ed0f9d7c24061525c8545;hb=11e4e463d490667a1ad5dba30ebdc4325a5211c4;hp=1a0f6ff2d76119f7907785187a94e0541be72079;hpb=2e07422de9b867dce18ff2ffbbf1f6e6863e5a82;p=prosody.git

diff --git a/prosody b/prosody
index 1a0f6ff2..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));