Software / code / prosody
Changeset
4827:fefbfd76d2d3
prosodyctl: Show an error if the user doesn't supply a hostname to the certificate commands
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 09 May 2012 01:11:27 +0200 |
| parents | 4826:1c4852da78c8 |
| children | 4828:f3e841521436 |
| files | prosodyctl |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Wed May 09 01:02:00 2012 +0200 +++ b/prosodyctl Wed May 09 01:11:27 2012 +0200 @@ -205,6 +205,7 @@ ["invalid-hostname"] = "The given hostname is invalid"; ["no-password"] = "No password was supplied"; ["no-such-user"] = "The given user does not exist on the server"; + ["no-such-host"] = "The given hostname does not exist in the config"; ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?"; ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help"; ["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info"; @@ -648,7 +649,7 @@ show_message("Config written to " .. conf_filename); return nil, conf_filename; else - show_usage("cert config HOSTNAME", "generates config for OpenSSL") + show_usage("cert config HOSTNAME", "builds a config for OpenSSL") end end @@ -714,6 +715,10 @@ if #arg >= 1 and arg[1] ~= "--help" then local subcmd = table.remove(arg, 1); if type(cert_commands[subcmd]) == "function" then + if not hosts[arg[1]] then + show_message(error_messages["no-such-host"]); + return + end return cert_commands[subcmd](arg); end end
