diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-10-24 15:30:37 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-10-24 15:30:37 +1000 |
| commit | a6858a6ce4d7b803d30752ed091e8f7d14344c6c (patch) | |
| tree | 6605fc5b555e6d9129442d0c3cd355adfe1f22ad /doc | |
| parent | CAPTCHA IBR support (EJAB-1262) (diff) | |
| parent | Improve example of outoging_s2s_options (diff) | |
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide.html | 7 | ||||
| -rw-r--r-- | doc/guide.tex | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/guide.html b/doc/guide.html index 3b0ad2369..d347087fa 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -819,11 +819,12 @@ use STARTTLS for s2s connections. file containing a SSL certificate. </DD><DT CLASS="dt-description"><B><TT>{domain_certfile, Domain, Path}</TT></B></DT><DD CLASS="dd-description"> Full path to the file containing the SSL certificate for a specific domain. -</DD><DT CLASS="dt-description"><B><TT>{outgoing_s2s_options, Methods, Timeout}</TT></B></DT><DD CLASS="dd-description"> +</DD><DT CLASS="dt-description"><B><TT>{outgoing_s2s_options, [Family, ...], Timeout}</TT></B></DT><DD CLASS="dd-description"> Specify which address families to try, in what order, and connect timeout in milliseconds. By default it first tries connecting with IPv4, if that fails it tries using IPv6, -with a timeout of 10000 milliseconds. -</DD><DT CLASS="dt-description"><B><TT>{s2s_dns_options, [ {Property, Value}, ...]}</TT></B></DT><DD CLASS="dd-description"> +with a timeout of 10000 milliseconds: +<PRE CLASS="verbatim">{outgoing_s2s_options, [ipv4, ipv6], 10000}. +</PRE></DD><DT CLASS="dt-description"><B><TT>{s2s_dns_options, [ {Property, Value}, ...]}</TT></B></DT><DD CLASS="dd-description"> Define properties to use for DNS resolving. Allowed Properties are: <TT>timeout</TT> in seconds which default value is <TT>10</TT> and <TT>retries</TT> which default value is <TT>2</TT>. diff --git a/doc/guide.tex b/doc/guide.tex index c54926ce0..71e019c05 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -962,7 +962,7 @@ There are some additional global options that can be specified in the ejabberd c file containing a SSL certificate. \titem{\{domain\_certfile, Domain, Path\}} \ind{options!domain\_certfile} Full path to the file containing the SSL certificate for a specific domain. - \titem{\{outgoing\_s2s\_options, Methods, Timeout\}} \ind{options!outgoing\_s2s\_options} + \titem{\{outgoing\_s2s\_options, [Family, ...], Timeout\}} \ind{options!outgoing\_s2s\_options} Specify which address families to try, in what order, and connect timeout in milliseconds. By default it first tries connecting with IPv4, if that fails it tries using IPv6, with a timeout of 10000 milliseconds. @@ -1053,6 +1053,7 @@ However, the c2s and s2s connections to the domain \term{example.com} use the fi {s2s_use_starttls, true}. {s2s_certfile, "/etc/ejabberd/server.pem"}. {domain_certfile, "example.com", "/etc/ejabberd/example_com.pem"}. +{outgoing_s2s_options, [ipv4, ipv6], 10000}. \end{verbatim} In this example, the following configuration defines that: |