aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-11-02 00:00:42 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-11-02 00:00:42 +0500
commit464f525c81423ff7b8d6814fceeb0657b8cbcc29 (patch)
treed56c41c38fb84a85a38382c0345c25403483f58f /prosody
parent163e9d4bef7a7affe4de50816b61fa729c1802b3 (diff)
downloadprosody-464f525c81423ff7b8d6814fceeb0657b8cbcc29.tar.gz
prosody-464f525c81423ff7b8d6814fceeb0657b8cbcc29.zip
prosody: Ensure prosody.paths.config is never nil (certmanager.create_context fails otherwise).
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody2
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody b/prosody
index b354089b..e18b4e61 100755
--- a/prosody
+++ b/prosody
@@ -203,7 +203,7 @@ function init_global_state()
-- path1;path2;path3;defaultpath...
CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
end
- prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
+ prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR or ".",
plugins = CFG_PLUGINDIR or "plugins", data = data_path };
prosody.arg = _G.arg;