aboutsummaryrefslogtreecommitdiffstats
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
commit418962b61c0f94621515125c59185d428bce1327 (patch)
tree12eacc631d6df28fa731ec8c15923a43d2bbae19
parent56fa06726426891f0ebc7c3bfc7e69ec38ec0a12 (diff)
parentd7900a6980737c8fd3c7f51794a003c96f264a75 (diff)
downloadprosody-418962b61c0f94621515125c59185d428bce1327.tar.gz
prosody-418962b61c0f94621515125c59185d428bce1327.zip
Merge 0.10->trunk
-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)