prosody
3ff83773ffc0
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7074:3ff83773ffc0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Jan 2016 03:57:17 +0100
parent 7065:4fc3c008976f
child 7080:6946c3d5645f
comparison
equal deleted inserted replaced
7063:bc1b375f379e 7074:3ff83773ffc0
790 local ret; 790 local ret;
791 if key_filename and conf_filename and cert_filename 791 if key_filename and conf_filename and cert_filename
792 and openssl.req{new=true, x509=true, nodes=true, key=key_filename, 792 and openssl.req{new=true, x509=true, nodes=true, key=key_filename,
793 days=365, sha256=true, utf8=true, config=conf_filename, out=cert_filename} then 793 days=365, sha256=true, utf8=true, config=conf_filename, out=cert_filename} then
794 show_message("Certificate written to ".. cert_filename); 794 show_message("Certificate written to ".. cert_filename);
795 print();
796 show_message(("Example config:\n\nssl = {\n\tcertificate = %q;\n\tkey = %q;\n}"):format(cert_filename, key_filename));
795 else 797 else
796 show_message("There was a problem, see OpenSSL output"); 798 show_message("There was a problem, see OpenSSL output");
797 end 799 end
798 else 800 else
799 show_usage("cert generate HOSTNAME [HOSTNAME+]", "Generates a self-signed certificate for the current hostname(s)") 801 show_usage("cert generate HOSTNAME [HOSTNAME+]", "Generates a self-signed certificate for the current hostname(s)")