aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-29 00:36:04 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-29 00:36:04 +0100
commite157445db73e3901eced621c1117a1ea508ea4b6 (patch)
treeb64e7d91badb210f2c1e3a857ddf921b164fb8aa /prosodyctl
parentabea06b4d569016d7f83429c90635edb451c9b3b (diff)
parentc596e86388de98d061508b5659f7ad1652654ca0 (diff)
downloadprosody-e157445db73e3901eced621c1117a1ea508ea4b6.tar.gz
prosody-e157445db73e3901eced621c1117a1ea508ea4b6.zip
Merge 0.9->trunk
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl8
1 files changed, 4 insertions, 4 deletions
diff --git a/prosodyctl b/prosodyctl
index 24d28157..30a10b9a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -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