diff --git a/doc/guide.html b/doc/guide.html index 48d0469c8..6d95e6e73 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -101,6 +101,14 @@ database, and in next time they will be APPENDED to existing values. E. g. if this file will not contain ``host'' definition, then old value will be used.

+To override old values following lines can be added in config: +
+override_global.
+override_local.
+override_acls.
+
With this lines old global or local options or ACLs will be removed before +adding new ones.
+

3.1.1   Host Name

@@ -109,42 +117,9 @@ used.
serves. E. g. to use jabber.org domain add following line in config: 
 {host, "jabber.org"}.
-
- -

3.1.2   Listened Sockets

- -Option listen defines list of listened sockets and what services -runned on them. Each element of list is a tuple with following elements: -Currently three modules implemented: -For example, following configuration defines that C2S connections listened on -port 5222, S2S on port 5269 and that service conference.jabber.org -must be connected to port 8888 with password ``secret''.
-
-
-{listen, [{5222, ejabberd_c2s,     start, []},
-          {5269, ejabberd_s2s_in,  start, []},
-          {8888, ejabberd_service, start, ["conference.jabber.org", "secret"]}
-         ]}.
-

3.1.3   Access Rules

+

3.1.2   Access Rules

Access control in ejabberd is done via Access Control Lists (ACL). In config file they looks like this: @@ -213,6 +188,12 @@ config file they looks like this: If the first character after `[' is a `!', then any character not enclosed is matched. +Following ACLs pre-defined: +
+
+all
Matches all JIDs. + +
none
Matches none JIDs.
Allowing or denying of different services is like this: 
 {access, <accessname>, [{allow, <aclname>},
@@ -229,6 +210,57 @@ Example:
 {access, configure, [{allow, admin}]}.
 {access, something, [{deny, badmans},
                      {allow, all}]}.
+
Following access rules pre-defined: +
+
+all
Always return ``allow'' + +
none
Always return ``deny'' +
+ +

3.1.3   Listened Sockets

+ +Option listen defines list of listened sockets and what services +runned on them. Each element of list is a tuple with following elements: +Currently three modules implemented: +
+
+ejabberd_c2s
This module serves C2S connections.
+
+ Following options defined: +
+
+ {access, <access rule>}
This option defines access of users + to this C2S port. Default value is ``all''. +
+ +
ejabberd_s2s_in
This module serves incoming S2S connections. + +
ejabberd_service
This module serves connections to Jabber + services (i. e. that use jabber:component:accept namespace). +
For example, following configuration defines that C2S connections listened on +port 5222 and denied for user ``bad'', S2S on port 5269 and that +service conference.jabber.org must be connected to port 8888 with +password ``secret''.
+
+
+{acl, blocked, {user, "bad"}}.
+{access, c2s, [{deny, blocked},
+               {allow, all}]}.
+{listen, [{5222, ejabberd_c2s,     start, [{access, c2s}]},
+          {5269, ejabberd_s2s_in,  start, []},
+          {8888, ejabberd_service, start,
+           [{host, "conference.jabber.org", [{password, "secret"}]}]}
+         ]}.

3.1.4   Modules

@@ -282,7 +314,7 @@ have access to connect to port 4369 of all another nodes, and must have same magic cookie (see Erlang/OTP documentation, in short file ~ejabberd/.erlang.cookie must be the same on all nodes). This is needed because all nodes exchange information about connected users, S2S -connection, registered services, etc...
+connections, registered services, etc...

Each ejabberd node run following modules: