Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-09-27 14:30:55 +02:00
Code Releases Activity

Merge pull request #257 from weiss/fix-option-name

Browse Source 
Fix "s2s_access" option name in documentation
This commit is contained in:
Evgeny Khramtsov 2014-07-22 17:47:04 +04:00
commit 9ff3ce8bd1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guide.tex
View File

@ -1288,11 +1288,11 @@ access:
all: normal all: normal
xmlrpc_access: xmlrpc_access:
xmlrpc_bot: allow xmlrpc_bot: allow
s2s_access: s2s:
trusted_servers: allow trusted_servers: allow
all: deny all: deny
s2s_certfile: "/path/to/ssl.pem" s2s_certfile: "/path/to/ssl.pem"
s2s_policy: s2s_access s2s_access: s2s
s2s_use_starttls: required_trusted s2s_use_starttls: required_trusted
listen: listen:
- -

4
ejabberd.yml.example
View File

@ -196,7 +196,7 @@ listen:
## ##
## Default s2s policy for undefined hosts. ## Default s2s policy for undefined hosts.
## ##
## s2s_policy: s2s_access ## s2s_access: s2s
## ##
## Outgoing S2S options ## Outgoing S2S options
@ -487,7 +487,7 @@ access:
trusted_network: trusted_network:
loopback: allow loopback: allow
## Do not establish S2S connections with bad servers ## Do not establish S2S connections with bad servers
## s2s_access: ## s2s:
## bad_servers: deny ## bad_servers: deny
## all: allow ## all: allow