aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-03-22 21:47:16 +0000
committerMatthew Wild <mwild1@gmail.com>2018-03-22 21:47:16 +0000
commit34473917a1c782b036b479c6268890d2ac29bf55 (patch)
tree388d51deb149ef4e7a8ffb011fb3d76342cf78b5 /util
parent2ce0219833fcbe10ed85d5c301adf3c3d5fce3c7 (diff)
downloadprosody-34473917a1c782b036b479c6268890d2ac29bf55.tar.gz
prosody-34473917a1c782b036b479c6268890d2ac29bf55.zip
util.startup: Fix variable usage [luacheck]
Diffstat (limited to 'util')
-rw-r--r--util/startup.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/startup.lua b/util/startup.lua
index c4ea8a30..d8d9866f 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -398,7 +398,7 @@ function startup.switch_user()
print("Warning: Couldn't switch to Prosody user/group '"..tostring(desired_user).."'/'"..tostring(desired_group).."': "..tostring(err));
else
-- Make sure the Prosody user can read the config
- local conf, err, errno = io.open(ENV_CONFIG);
+ local conf, err, errno = io.open(prosody.config_file);
if conf then
conf:close();
else
@@ -412,8 +412,8 @@ function startup.switch_user()
-- Set our umask to protect data files
pposix.umask(config.get("*", "umask") or "027");
- pposix.setenv("HOME", data_path);
- pposix.setenv("PROSODY_CONFIG", ENV_CONFIG);
+ pposix.setenv("HOME", prosody.paths.data);
+ pposix.setenv("PROSODY_CONFIG", prosody.config_file);
else
print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
print("For more help send the below error to us through https://prosody.im/discuss");