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

prosodyctl: Delay reporting of successful certificate imports until all done

Browse source
This commit is contained in:
Kim Alvefur 2017-04-22 19:11:26 +02:00
parent b9401b9307
commit eae8bd26c2
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
prosodyctl
View file

@ -873,18 +873,19 @@ function cert_commands.import(arg)
owner = config.get("*", "prosody_user") or "prosody"; owner = config.get("*", "prosody_user") or "prosody";
group = config.get("*", "prosody_group") or owner; group = config.get("*", "prosody_group") or owner;
end end
local imported = {};
for _, host in ipairs(hostnames) do for _, host in ipairs(hostnames) do
for _, dir in ipairs(arg) do for _, dir in ipairs(arg) do
if lfs.attributes(dir .. "/" .. host .. "/fullchain.pem") if lfs.attributes(dir .. "/" .. host .. "/fullchain.pem")
and lfs.attributes(dir .. "/" .. host .. "/privkey.pem") then and lfs.attributes(dir .. "/" .. host .. "/privkey.pem") then
copy(dir .. "/" .. host .. "/fullchain.pem", cert_basedir .. "/" .. host .. ".crt", nil, owner, group); copy(dir .. "/" .. host .. "/fullchain.pem", cert_basedir .. "/" .. host .. ".crt", nil, owner, group);
copy(dir .. "/" .. host .. "/privkey.pem", cert_basedir .. "/" .. host .. ".key", "0377", 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") elseif lfs.attributes(dir .. "/" .. host .. ".crt")
and lfs.attributes(dir .. "/" .. host .. ".key") then and lfs.attributes(dir .. "/" .. host .. ".key") then
copy(dir .. "/" .. host .. ".crt", cert_basedir .. "/" .. host .. ".crt", nil, owner, group); copy(dir .. "/" .. host .. ".crt", cert_basedir .. "/" .. host .. ".crt", nil, owner, group);
copy(dir .. "/" .. host .. ".key", cert_basedir .. "/" .. host .. ".key", "0377", 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 else
show_warning("No certificate for host "..host.." found :("); show_warning("No certificate for host "..host.." found :(");
end end
@ -893,6 +894,9 @@ function cert_commands.import(arg)
-- Private key matches public key in certificate -- Private key matches public key in certificate
end end
end end
if imported[1] then
show_message("Imported certificate and key for hosts "..table.concat(imported, ", "));
end
end end
function commands.cert(arg) function commands.cert(arg)