diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:52:23 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-29 10:52:23 +0100 |
commit | 06f390561d388c0858ab87ec6f7e24e858799429 (patch) | |
tree | e8a0c90000f96854c20eddf617b4d3ef09dc8370 /prosodyctl | |
parent | a4390dda1d291b1ede374b28e7de5828ae71d204 (diff) | |
parent | 1bc6b892999e0ba4b45e4b0b7cf1b1f54ffd7e54 (diff) | |
download | prosody-06f390561d388c0858ab87ec6f7e24e858799429.tar.gz prosody-06f390561d388c0858ab87ec6f7e24e858799429.zip |
Merge with Florob
Diffstat (limited to 'prosodyctl')
-rwxr-xr-x | prosodyctl | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -654,7 +654,7 @@ end function cert_commands.config(arg) if #arg >= 1 and arg[1] ~= "--help" then - local conf_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cnf"; + local conf_filename = (CFG_DATADIR or "./certs") .. "/" .. arg[1] .. ".cnf"; if ask_overwrite(conf_filename) then return nil, conf_filename; end @@ -687,7 +687,7 @@ end function cert_commands.key(arg) if #arg >= 1 and arg[1] ~= "--help" then - local key_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".key"; + local key_filename = (CFG_DATADIR or "./certs") .. "/" .. arg[1] .. ".key"; if ask_overwrite(key_filename) then return nil, key_filename; end @@ -709,7 +709,7 @@ end function cert_commands.request(arg) if #arg >= 1 and arg[1] ~= "--help" then - local req_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".req"; + local req_filename = (CFG_DATADIR or "./certs") .. "/" .. arg[1] .. ".req"; if ask_overwrite(req_filename) then return nil, req_filename; end @@ -727,7 +727,7 @@ end function cert_commands.generate(arg) if #arg >= 1 and arg[1] ~= "--help" then - local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".crt"; + local cert_filename = (CFG_DATADIR or "./certs") .. "/" .. arg[1] .. ".crt"; if ask_overwrite(cert_filename) then return nil, cert_filename; end |