Software / code / prosody
Changeset
8117:66d8f6b3c3ef
prosodyctl: Delay reporting of successful certificate imports until all done
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 22 Apr 2017 19:11:26 +0200 |
| parents | 8116:76ac8b617402 |
| children | 8118:f8c52010bd37 |
| files | prosodyctl |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Sat Apr 22 16:41:44 2017 +0200 +++ b/prosodyctl Sat Apr 22 19:11:26 2017 +0200 @@ -873,18 +873,19 @@ 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 show_warning("No certificate for host "..host.." found :("); end @@ -893,6 +894,9 @@ -- Private key matches public key in certificate end end + if imported[1] then + show_message("Imported certificate and key for hosts "..table.concat(imported, ", ")); + end end function commands.cert(arg)
