25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* doc/guide.tex: Updated

SVN Revision: 449
This commit is contained in:
Alexey Shchepin 2005-12-06 20:03:21 +00:00
parent 359f15ffb9
commit c321eda0b3
3 changed files with 585 additions and 576 deletions

View File

@ -1,3 +1,7 @@
2005-12-06 Alexey Shchepin <alexey@sevcom.net>
* doc/guide.tex: Updated
2005-12-06 Mickael Remond <mickael.remond@erlang-fr.org> 2005-12-06 Mickael Remond <mickael.remond@erlang-fr.org>
* src/ejabberd.cfg.example: Updated * src/ejabberd.cfg.example: Updated

File diff suppressed because it is too large Load Diff

View File

@ -582,11 +582,22 @@ The following options are available:
``configure'' access rule. ``configure'' access rule.
\end{description} \end{description}
Also the following global options are available for s2s connections:
\begin{description}
\titem{\{s2s\_use\_starttls, true|false\}}
\ind{options!s2s\_use\_starttls}This option defines whether use or not
STARTTLS for s2s connections.
\titem{\{s2s\_certfile, Path\}} \ind{options!s2s\_certificate}Path to a file
containing the SSL certificate.
\titem{\{domain\_certfile, Domain, Path\}} \ind{options!domain\_certfile}Path
to a file containing the SSL certificate for specified domain.
\end{description}
For instance, the following configuration defines that: For instance, the following configuration defines that:
\begin{itemize} \begin{itemize}
\item c2s connections are listened for on port 5222 and 5223 (SSL) and denied \item c2s connections are listened for on port 5222 and 5223 (SSL) and denied
for the user ``\term{bad}'' for the user ``\term{bad}''
\item s2s connections are listened for on port 5269 \item s2s connections are listened for on port 5269 with STARTTLS enabled
\item Port 5280 is serving the web interface and the HTTP Polling service. Note \item Port 5280 is serving the web interface and the HTTP Polling service. Note
that it is also possible to serve them on different ports. The second that it is also possible to serve them on different ports. The second
example in section~\ref{sec:webadm} shows how exactly this can be done. example in section~\ref{sec:webadm} shows how exactly this can be done.
@ -641,6 +652,8 @@ For instance, the following configuration defines that:
[{password, "jmcsecret"}]}]} [{password, "jmcsecret"}]}]}
] ]
}. }.
{s2s_use_starttls, true}.
{s2s_certfile, "/path/to/ssl.pem"}.
\end{verbatim} \end{verbatim}
Note, that for \ind{jabberd 1.4}jabberd 1.4- or \ind{WPJabber}WPJabber-based Note, that for \ind{jabberd 1.4}jabberd 1.4- or \ind{WPJabber}WPJabber-based
services you have to make the transports log and do \ind{XDB}XDB by themselves: services you have to make the transports log and do \ind{XDB}XDB by themselves: