# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1492698073 -7200
# Node ID a0b498ec0b222218719f099f075986dbc7d665af
# Parent  3e25d96571d1ebef22ab60bed8d944ccb49da123# Parent  927b9c5cc17ad05f06a9cb8900667073d24936b0
Merge 0.10->trunk

diff -r 3e25d96571d1 -r a0b498ec0b22 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)