diff options
Diffstat (limited to 'doc/guide.tex')
| -rw-r--r-- | doc/guide.tex | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/guide.tex b/doc/guide.tex index dd425572..21e66a08 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -68,6 +68,7 @@ \newcommand{\modannounce}{\module{mod\_announce}} \newcommand{\modblocking}{\module{mod\_blocking}} \newcommand{\modcaps}{\module{mod\_caps}} +\newcommand{\modcarboncopy}{\module{mod\_carboncopy}} \newcommand{\modconfigure}{\module{mod\_configure}} \newcommand{\moddisco}{\module{mod\_disco}} \newcommand{\modecho}{\module{mod\_echo}} @@ -869,7 +870,7 @@ The available modules, their purpose and the options allowed by each one are: \begin{description} \titem{\texttt{ejabberd\_c2s}} Handles c2s connections.\\ - Options: \texttt{access}, \texttt{certfile}, \texttt{ciphers}, + Options: \texttt{access}, \texttt{certfile}, \texttt{ciphers}, \texttt{protocol\_options} \texttt{max\_fsm\_queue}, \texttt{max\_stanza\_size}, \texttt{shaper}, \texttt{starttls}, \texttt{starttls\_required}, \texttt{tls}, @@ -917,6 +918,10 @@ This is a detailed description of each option allowed by the listening modules: To define a certificate file specific for a given domain, use the global option \term{domain\_certfile}. \titem{ciphers: Ciphers} OpenSSL ciphers list in the same format accepted by `\verb|openssl ciphers|' command. + \titem{protocol\_options: ProtocolOpts} \ind{options!protocol\_options} + List of general options relating to SSL/TLS. These map to \verb|<a href="https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html">OpenSSL's set_options()</a>|. + For a full list of options available in ejabberd, \verb|<a href="https://github.com/processone/tls/blob/master/c_src/options.h">see the source</a>|. + The default entry is: \verb|"no_sslv2"| \titem{default\_host: undefined|HostName\}} If the HTTP request received by ejabberd contains the HTTP header \term{Host} with an ambiguous virtual host that doesn't match any one defined in ejabberd (see \ref{hostnames}), @@ -1065,6 +1070,10 @@ There are some additional global options that can be specified in the ejabberd c Full path to the file containing the SSL certificate for a specific domain. \titem{s2s\_ciphers: Ciphers} \ind{options!s2s\_ciphers} OpenSSL ciphers list in the same format accepted by `\verb|openssl ciphers|' command. + \titem{s2s\_protocol\_options: ProtocolOpts} \ind{options!s2s\_protocol\_options} + List of general options relating to SSL/TLS. These map to \verb|<a href="https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html">OpenSSL's set_options()</a>|. + For a full list of options available in ejabberd, \verb|<a href="https://github.com/processone/tls/blob/protocol_options/c_src/options.h">see the source</a>|. + The default entry is: \verb|"no_sslv2"| \titem{outgoing\_s2s\_families: [Family, ...]} \ind{options!outgoing\_s2s\_families} Specify which address families to try, in what order. By default it first tries connecting with IPv4, if that fails it tries using IPv6. @@ -1784,7 +1793,7 @@ The syntax is: When a JID is checked to have access to \term{Accessname}, the server sequentially checks if that JID matches any of the ACLs that are named in the -second elements of the tuples in the list. If it matches, the first element of +first elements of the tuples in the list. If it matches, the second element of the first matched tuple is returned, otherwise the value `\term{deny}' is returned. @@ -2521,8 +2530,7 @@ modules: mod_echo: {} \end{verbatim} \item In the second example the modules \modecho{}, \modtime{}, and - \modversion{} are loaded without options. Remark that, besides the last entry, - all entries end with a comma: + \modversion{} are loaded without options. \begin{verbatim} modules: mod_echo: {} @@ -2545,6 +2553,7 @@ The following table lists all modules included in \ejabberd{}. \hline \ahrefloc{modannounce}{\modannounce{}} & Manage announcements & recommends \modadhoc{} \\ \hline \modblocking{} & Simple Communications Blocking (\xepref{0191}) & \modprivacy{} \\ \hline \modcaps{} & Entity Capabilities (\xepref{0115}) & \\ + \hline \modcarboncopy{} & Message Carbons (\xepref{0280}) & \\ \hline \modconfigure{} & Server configuration using Ad-Hoc & \modadhoc{} \\ \hline \ahrefloc{moddisco}{\moddisco{}} & Service Discovery (\xepref{0030}) & \\ \hline \ahrefloc{modecho}{\modecho{}} & Echoes XMPP stanzas & \\ |