diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-29 00:36:04 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-29 00:36:04 +0100 |
| commit | fd324936d0c7a45c9e2b54a3eb4690bf5f46b020 (patch) | |
| tree | b64e7d91badb210f2c1e3a857ddf921b164fb8aa /prosodyctl | |
| parent | c5f20ce901c0c929c4ff5378269288e30c6977b4 (diff) | |
| parent | f704c2bc9045e92272fdd687c887771754b55007 (diff) | |
| download | prosody-fd324936d0c7a45c9e2b54a3eb4690bf5f46b020.tar.gz prosody-fd324936d0c7a45c9e2b54a3eb4690bf5f46b020.zip | |
Merge 0.9->trunk
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 |