diff options
| author | Badlop <badlop@process-one.net> | 2008-12-26 11:45:08 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-12-26 11:45:08 +0000 |
| commit | 682909e0fc63d869da34e29c26ed304ff2cc3901 (patch) | |
| tree | 95f4c343a95838767d68e93cd570dd693bf68396 /doc | |
| parent | * src/odbc/ejabberd_odbc.erl: get rid of SERIALIZABLE isolation level on MySQ... (diff) | |
* src/ejabberd_config.erl: Option outgoing_s2s_options to define
s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
Maka)(EJAB-665)
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1756
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide.html | 8 | ||||
| -rw-r--r-- | doc/guide.tex | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/guide.html b/doc/guide.html index 2982f355d..6d143c335 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -745,6 +745,10 @@ 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"> +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_default_policy, allow|deny}</TT></B></DT><DD CLASS="dd-description"> The default policy for incoming and outgoing s2s connections to other Jabber servers. The default value is <TT>allow</TT>. @@ -1032,6 +1036,10 @@ declarations of ACLs in the configuration file have the following syntax: </PRE></DD><DT CLASS="dt-description"><B><TT>{resource, <resource>}</TT></B></DT><DD CLASS="dd-description"> Matches any JID with a resource <TT><resource></TT>. Example: <PRE CLASS="verbatim">{acl, mucklres, {resource, "muckl"}}. +</PRE></DD><DT CLASS="dt-description"><B><TT>{shared_group, <groupname>}</TT></B></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT><groupname></TT> in the virtual host. Example: +<PRE CLASS="verbatim">{acl, techgroupmembers, {shared_group, "techteam"}}. +</PRE></DD><DT CLASS="dt-description"><B><TT>{shared_group, <groupname>, <server>}</TT></B></DT><DD CLASS="dd-description"> Matches any member of a Shared Roster Group with name <TT><groupname></TT> in the virtual host <TT><server></TT>. Example: +<PRE CLASS="verbatim">{acl, techgroupmembers, {shared_group, "techteam", "example.org"}}. </PRE></DD><DT CLASS="dt-description"><B><TT>{user_regexp, <regexp>}</TT></B></DT><DD CLASS="dd-description"> Matches any local user with a name that matches <TT><regexp></TT> on local virtual hosts. Example: <PRE CLASS="verbatim">{acl, tests, {user_regexp, "^test[0-9]*$"}}. diff --git a/doc/guide.tex b/doc/guide.tex index 9501c0cc5..afc63a3ff 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -870,6 +870,10 @@ There are some additional global options: 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} + 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. \titem{\{s2s\_default\_policy, allow|deny\}} The default policy for incoming and outgoing s2s connections to other Jabber servers. The default value is \term{allow}. |