aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-03 22:19:09 +0100
committerKim Alvefur <zash@zash.se>2019-11-03 22:19:09 +0100
commit5e4bc6299bb49f469cc180cd6a1ba76fd46ae6ee (patch)
treea7a3ede7361f40e9950a35d77f633b446ff8e82a
parentnet.resolvers: Abort on hostnames not passing IDNA validation (diff)
downloadprosody-5e4bc6299bb49f469cc180cd6a1ba76fd46ae6ee.tar.xz
prosody-5e4bc6299bb49f469cc180cd6a1ba76fd46ae6ee.zip
util.startup: Update config path (fixes #1430)
-rw-r--r--util/startup.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua
index c101c2904..82d0804d8 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -33,7 +33,8 @@ function startup.read_config()
if file then
file:close();
prosody.config_file = filename;
- CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$"); -- luacheck: ignore 111
+ prosody.paths.config = filename:match("^(.*)[\\/][^\\/]*$");
+ CFG_CONFIGDIR = prosody.paths.config; -- luacheck: ignore 111
break;
end
end