Software /
code /
prosody
Diff
prosodyctl @ 7530:f14094d10925
Merge 0.10 -> trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 28 Jul 2016 09:39:50 +0100 |
parent | 7494:f82356adcd71 |
parent | 7528:50365a496890 |
child | 7686:8d6f367bed8c |
line wrap: on
line diff
--- a/prosodyctl Wed Jul 27 15:05:54 2016 +0100 +++ b/prosodyctl Thu Jul 28 09:39:50 2016 +0100 @@ -268,7 +268,6 @@ local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning; local show_usage = prosodyctl.show_usage; -local getchar, getpass = prosodyctl.getchar, prosodyctl.getpass; local show_yesno = prosodyctl.show_yesno; local show_prompt = prosodyctl.show_prompt; local read_password = prosodyctl.read_password; @@ -547,7 +546,6 @@ print("Source directory: "..relpath(pwd, CFG_SOURCEDIR or ".")); print("Plugin directories:") print(" "..(prosody.paths.plugins:gsub("([^;]+);?", function(path) - local opath = path; path = config.resolve_relative_path(pwd, path); local hgid, hgrepo = hg.check_id(path); if not hgid and hgrepo then @@ -804,7 +802,6 @@ end local _, key_filename = cert_commands.key({arg[1]}); local _, conf_filename = cert_commands.config(arg); - local ret; if key_filename and conf_filename and cert_filename and openssl.req{new=true, x509=true, nodes=true, key=key_filename, days=365, sha256=true, utf8=true, config=conf_filename, out=cert_filename} then