prosody
a0b498ec0b22
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 8103:a0b498ec0b22

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Apr 2017 16:21:13 +0200
parent 8101:3e25d96571d1
parent 8102:927b9c5cc17a
child 8112:d8ecefcb7c97
comparison
equal deleted inserted replaced
8101:3e25d96571d1 8103:a0b498ec0b22
699 699
700 local cert_basedir = CFG_DATADIR or "./certs"; 700 local cert_basedir = CFG_DATADIR or "./certs";
701 if have_pposix and pposix.getuid() == 0 then 701 if have_pposix and pposix.getuid() == 0 then
702 -- FIXME should be enough to check if this directory is writable 702 -- FIXME should be enough to check if this directory is writable
703 local cert_dir = config.get("*", "certificates") or "certs"; 703 local cert_dir = config.get("*", "certificates") or "certs";
704 cert_basedir = config.resolve_relative_path(config.paths.certs, cert_dir); 704 cert_basedir = config.resolve_relative_path(prosody.paths.config, cert_dir);
705 end 705 end
706 706
707 function cert_commands.config(arg) 707 function cert_commands.config(arg)
708 if #arg >= 1 and arg[1] ~= "--help" then 708 if #arg >= 1 and arg[1] ~= "--help" then
709 local conf_filename = cert_basedir .. "/" .. arg[1] .. ".cnf"; 709 local conf_filename = cert_basedir .. "/" .. arg[1] .. ".cnf";