mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-04-24 14:19:49 +02:00
commit 706849aa1e
3 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
prosodyctl
View file

@ -873,19 +873,21 @@ function cert_commands.import(arg)
owner = config.get("*", "prosody_user") or "prosody";
group = config.get("*", "prosody_group") or owner;
end
local imported = {};
for _, host in ipairs(hostnames) do
for _, dir in ipairs(arg) do
if lfs.attributes(dir .. "/" .. host .. "/fullchain.pem")
and lfs.attributes(dir .. "/" .. host .. "/privkey.pem") then
copy(dir .. "/" .. host .. "/fullchain.pem", cert_basedir .. "/" .. host .. ".crt", nil, owner, group);
copy(dir .. "/" .. host .. "/privkey.pem", cert_basedir .. "/" .. host .. ".key", "0377", owner, group);
show_message("Imported certificate and key for "..host);
table.insert(imported, host);
elseif lfs.attributes(dir .. "/" .. host .. ".crt")
and lfs.attributes(dir .. "/" .. host .. ".key") then
copy(dir .. "/" .. host .. ".crt", cert_basedir .. "/" .. host .. ".crt", nil, owner, group);
copy(dir .. "/" .. host .. ".key", cert_basedir .. "/" .. host .. ".key", "0377", owner, group);
show_message("Imported certificate and key for "..host);
table.insert(imported, host);
else
-- TODO Say where we looked
show_warning("No certificate for host "..host.." found :(");
end
-- TODO Additional checks
@ -893,6 +895,16 @@ function cert_commands.import(arg)
-- Private key matches public key in certificate
end
end
if imported[1] then
show_message("Imported certificate and key for hosts "..table.concat(imported, ", "));
local ok, err = prosodyctl.reload();
if not ok and err ~= "not-running" then
show_message(error_messages[err]);
end
else
show_warning("No certificates imported :(");
return 1;
end
end
function commands.cert(arg)