aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-27 18:30:11 +0200
committerKim Alvefur <zash@zash.se>2017-03-27 18:30:11 +0200
commite4c17b311b1f0880958aaf93ad31c00872a7c719 (patch)
treeafbf0fa015e2dd67b0e0977ded34834eee4830aa
parent9f1fee2164611477a30935cb3a2f08abdff56f60 (diff)
parent9c6c576f099d4f4f71edde0c47df60178b888afb (diff)
downloadprosody-e4c17b311b1f0880958aaf93ad31c00872a7c719.tar.gz
prosody-e4c17b311b1f0880958aaf93ad31c00872a7c719.zip
Merge 0.10->trunk
-rw-r--r--man/prosodyctl.man41
1 files changed, 39 insertions, 2 deletions
diff --git a/man/prosodyctl.man b/man/prosodyctl.man
index b91502a8..4854a0a7 100644
--- a/man/prosodyctl.man
+++ b/man/prosodyctl.man
@@ -1,7 +1,7 @@
-.\" Automatically generated by Pandoc 1.15.2
+.\" Automatically generated by Pandoc 1.19.2.1
.\"
-.hy
.TH "PROSODYCTL" "1" "2015\-12\-23" "" ""
+.hy
.SH NAME
.PP
prosodyctl \- Manage a Prosody XMPP server
@@ -86,6 +86,38 @@ files.
Prints the current execution status of the prosody server daemon.
.RS
.RE
+.SS Certificates
+.PP
+prosodyctl can create self\-signed certificates, certificate requests
+and private keys for use with Prosody.
+Commands are of the form \f[C]prosodyctl\ cert\ subcommand\f[].
+Commands take a list of hosts to be included in the certificate.
+.TP
+.B request hosts
+Create a certificate request (CSR) file for submission to a certificate
+authority.
+Multiple hosts can be given, sub\-domains are automatically included.
+.RS
+.RE
+.TP
+.B generate hosts
+Generate a self\-signed certificate.
+.RS
+.RE
+.TP
+.B key host [size]
+Generate a private key of \[aq]size\[aq] bits (defaults to 2048).
+Invoked automatically by \[aq]request\[aq] and \[aq]generate\[aq] if
+needed.
+.RS
+.RE
+.TP
+.B config hosts
+Produce a config file for the list of hosts.
+Invoked automatically by \[aq]request\[aq] and \[aq]generate\[aq] if
+needed.
+.RS
+.RE
.SS Debugging
.PP
prosodyctl can also show some information about the environment,
@@ -121,6 +153,11 @@ unregister\ user\ server
.fi
.SH OPTIONS
.TP
+.B \f[C]\-\-config\ filename\f[]
+Use the specified config file instead of the default.
+.RS
+.RE
+.TP
.B \f[C]\-\-help\f[]
Display help text for the specified command.
.RS