X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=c1606874a4a6f77da359e1dce9f6e88458161119;hb=e95400712490b988628cd84c273759954613acea;hp=6f5a14eb9521e9d3fa8f9019eb2f8eadbba8e1ae;hpb=9f6920d05572e16c30853ca82818023d3664439e;p=prosody.git

diff --git a/prosody b/prosody
index 6f5a14eb..c1606874 100755
--- a/prosody
+++ b/prosody
@@ -128,7 +128,7 @@ function log_dependency_warnings()
 end
 
 function sanity_check()
-	for host, host_config in pairs(configmanager.getconfig()) do
+	for host, host_config in pairs(config.getconfig()) do
 		if host ~= "*"
 		and host_config.core.enabled ~= false
 		and not host_config.core.component_module then
@@ -228,6 +228,11 @@ function init_global_state()
 		prosody.installed = true;
 	end
 	
+	if prosody.installed then
+		-- Change working directory to data path.
+		require "lfs".chdir(data_path);
+	end
+
 	-- Function to reload the config file
 	function prosody.reload_config()
 		log("info", "Reloading configuration file");