Comparison

prosodyctl @ 8128:c14513401d65

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 25 Apr 2017 01:42:59 +0200
parent 8121:a33a87f13155
parent 8122:e56a90168890
child 8146:5c91fb62338e
comparison
equal deleted inserted replaced
8121:a33a87f13155 8128:c14513401d65
934 return 1; 934 return 1;
935 end 935 end
936 return cert_commands[subcmd](arg); 936 return cert_commands[subcmd](arg);
937 end 937 end
938 end 938 end
939 show_usage("cert config|request|generate|key", "Helpers for generating X.509 certificates and keys.") 939 show_usage("cert config|request|generate|key|import", "Helpers for generating X.509 certificates and keys.")
940 end 940 end
941 941
942 function commands.check(arg) 942 function commands.check(arg)
943 if arg[1] == "--help" then 943 if arg[1] == "--help" then
944 show_usage([[check]], [[Perform basic checks on your Prosody installation]]); 944 show_usage([[check]], [[Perform basic checks on your Prosody installation]]);