aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-20 16:21:13 +0200
committerKim Alvefur <zash@zash.se>2017-04-20 16:21:13 +0200
commit8e1cca01e9779c7bc0f216fc51d77fa288d0865b (patch)
tree12eacc631d6df28fa731ec8c15923a43d2bbae19 /prosodyctl
parenta7b9c6de423f4f4572aaf81674903a27fbcd7c67 (diff)
parent9b5bd658a403fd1b1a7321d3d37ae2e8b8cba9a0 (diff)
downloadprosody-8e1cca01e9779c7bc0f216fc51d77fa288d0865b.tar.gz
prosody-8e1cca01e9779c7bc0f216fc51d77fa288d0865b.zip
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl2
1 files changed, 1 insertions, 1 deletions
diff --git a/prosodyctl b/prosodyctl
index 2c5e4f0f..4d911571 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -701,7 +701,7 @@ local cert_basedir = CFG_DATADIR or "./certs";
if have_pposix and pposix.getuid() == 0 then
-- FIXME should be enough to check if this directory is writable
local cert_dir = config.get("*", "certificates") or "certs";
- cert_basedir = config.resolve_relative_path(config.paths.certs, cert_dir);
+ cert_basedir = config.resolve_relative_path(prosody.paths.config, cert_dir);
end
function cert_commands.config(arg)