Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 20 Apr 2017 16:21:13 +0200
changeset 8106 a0b498ec0b22
parent 8104 3e25d96571d1 (current diff)
parent 8105 927b9c5cc17a (diff)
child 8115 d8ecefcb7c97
Merge 0.10->trunk
prosodyctl
--- a/prosodyctl	Thu Apr 20 00:41:49 2017 +0200
+++ b/prosodyctl	Thu Apr 20 16:21:13 2017 +0200
@@ -701,7 +701,7 @@
 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)