diff --git a/ChangeLog b/ChangeLog index ad8011f73..18e41da70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-07-31 Alexey Shchepin + * src/ejabberd_config.erl: Added host_config option + * doc/guide.tex: Updated + + * src/ejabberd_auth_ldap.erl: Bugfix + * src/msgs/ru.msg: Updated (thanks to Sergei Golovan) * src/msgs/uk.msg: Likewise diff --git a/doc/guide.html b/doc/guide.html index 61e37ee70..41e148c35 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -4,7 +4,7 @@ Ejabberd Installation and Operation Guide - + @@ -21,7 +21,7 @@ mailto:alexey@sevcom.net
xmpp:aleksey@jabber.ru -

May 23, 2005

+

July 31, 2005

@@ -61,53 +61,54 @@
  • 3.1.4  Shapers Configuration
  • 3.1.5  Listened Sockets
  • 3.1.6  Modules +
  • 3.1.7  Virtual Host Configuration -
  • 3.2  Online Configuration and Monitoring +
  • 3.2  Online Configuration and Monitoring -
  • 4  Clustering +
  • 4  Clustering -
  • A  Built-in Modules +
  • A  Built-in Modules -
  • B  I18n/L10n +
  • B  I18n/L10n @@ -639,14 +640,35 @@ Example: {mod_version, []} ]}. + + +

    3.1.7  Virtual Host Configuration

    + + +Options can be defined separately for different virtual hosts using +host_config option. It have the have following syntax: +
    +  {host_config, <hostname>, [<option>, <option>, ...]}.
+
    +Example: +
    +{host_config, "example.org", [{auth_method, internal}]}.
+
+{host_config, "example.com", [{auth_method, ldap},
+                              {ldap_servers, ["localhost"]},
+                              {ldap_uidattr, "uid"},
+                              {ldap_rootdn, "dc=localdomain"},
+                              {ldap_rootdn, "dc=example,dc=com"},
+                              {ldap_password, ""}]}.
+
    -

    3.2  Online Configuration and Monitoring

    +

    3.2  Online Configuration and Monitoring

    -

    3.2.1  Web-based Administration Interface

    +

    3.2.1  Web-based Administration Interface

    To perform online reconfiguration of ejabberd you need to enable @@ -682,7 +704,7 @@ manage DB, enable/disable listened ports, and view statistics.

    -

    3.2.2  ejabberdctl tool

    +

    3.2.2  ejabberdctl tool

    It is possible to do some administration operations using ejabberdctl @@ -710,12 +732,12 @@ Example: -

    4  Clustering

    +

    4  Clustering

    -

    4.1  How it works

    +

    4.1  How it works

    A Jabber domain is served by one or more ejabberd nodes. These nodes can @@ -735,7 +757,7 @@ router; -

    4.1.1  Router

    +

    4.1.1  Router

    This module is the main router of Jabber packets on each node. It routes them based on their destinations domains. It uses a global @@ -745,7 +767,7 @@ appropriate process. If no, then it is sent to the S2S manager.

    -

    4.1.2  Local Router

    +

    4.1.2  Local Router

    This module routes packets which have a destination domain equal to this server name. If destination JID has a non-empty user part, then @@ -754,7 +776,7 @@ its content.

    -

    4.1.3  Session Manager

    +

    4.1.3  Session Manager

    This module routes packets to local users. It searches to what user resource a packet must be sent via a presence table. Then packet is @@ -763,7 +785,7 @@ storage, or bounced back.

    -

    4.1.4  S2S Manager

    +

    4.1.4  S2S Manager

    This module routes packets to other Jabber servers. First, it checks if an opened S2S connection from the domain of the packet @@ -773,7 +795,7 @@ serving this connection, else a new connection is opened.

    -

    4.2  How to setup ejabberd cluster

    +

    4.2  How to setup ejabberd cluster

    Suppose you already setuped ejabberd on one of machines (first), and @@ -843,12 +865,12 @@ domain.

    -

    A  Built-in Modules

    +

    A  Built-in Modules

    -

    A.1  Common Options

    +

    A.1  Common Options

    The following options are used by many modules, so they are described in @@ -856,7 +878,7 @@ separate section.

    -

    A.1.1  iqdisc

    +

    A.1.1  iqdisc

    Many modules define handlers for processing IQ queries of different namespaces @@ -889,7 +911,7 @@ Example: -

    A.1.2  host

    +

    A.1.2  host

    This option explicitly defines hostname for the module which acts as a service.
    @@ -905,7 +927,7 @@ Example: -

    A.1.3  hosts

    +

    A.1.3  hosts

    This option explicitly defines a list of hostnames for the module which acts as @@ -922,7 +944,7 @@ Example: -

    A.2  mod_announce

    +

    A.2  mod_announce

    This module adds support for broadcast announce messages and MOTD. @@ -969,7 +991,7 @@ Example: -

    A.3  mod_configure

    +

    A.3  mod_configure

    Options: @@ -979,7 +1001,7 @@ discipline (see A.1.1). -

    A.4  mod_disco

    +

    A.4  mod_disco

    This module adds support for JEP-0030 (Service Discovery).
    @@ -1004,7 +1026,7 @@ Example: -

    A.5  mod_echo

    +

    A.5  mod_echo

    This module acts as a service and simply returns to sender any Jabber @@ -1022,7 +1044,7 @@ Options: -

    A.6  mod_irc

    +

    A.6  mod_irc

    This module implements IRC transport.
    @@ -1049,7 +1071,7 @@ Example: -

    A.7  mod_last

    +

    A.7  mod_last

    This module adds support for JEP-0012 (Last Activity)
    @@ -1061,7 +1083,7 @@ discipline (see A.1.1). -

    A.8  mod_muc

    +

    A.8  mod_muc

    This module implements JEP-0045 (Multi-User Chat) service.
    @@ -1100,14 +1122,14 @@ Example: -

    A.9  mod_offline

    +

    A.9  mod_offline

    This module implements offline message storage.

    -

    A.10  mod_privacy

    +

    A.10  mod_privacy

    This module implements Privacy Rules as defined in XMPP IM @@ -1120,7 +1142,7 @@ discipline (see A.1.1). -

    A.11  mod_private

    +

    A.11  mod_private

    This module adds support of JEP-0049 (Private XML Storage).
    @@ -1132,7 +1154,7 @@ discipline (see A.1.1). -

    A.12  mod_pubsub

    +

    A.12  mod_pubsub

    This module implements JEP-0060 (Publish-Subscribe Service).
    @@ -1161,7 +1183,7 @@ Example: -

    A.13  mod_register

    +

    A.13  mod_register

    This module adds support for JEP-0077 (In-Band Registration).
    @@ -1194,7 +1216,7 @@ Example: -

    A.14  mod_roster

    +

    A.14  mod_roster

    This module implements roster management.
    @@ -1206,7 +1228,7 @@ discipline (see A.1.1). -

    A.15  mod_service_log

    +

    A.15  mod_service_log

    This module adds support for logging of user packets via any jabber service. @@ -1229,7 +1251,7 @@ Example: -

    A.16  mod_shared_roster

    +

    A.16  mod_shared_roster

    This module implements shared roster groups support.
    @@ -1340,7 +1362,7 @@ create groups like on table 2.
    • -

    A.17  mod_stats

    +

    A.17  mod_stats

    This module adds support for JEP-0039 (Statistics Gathering).
    @@ -1352,7 +1374,7 @@ discipline (see A.1.1). -

    A.18  mod_time

    +

    A.18  mod_time

    This module answers UTC time on jabber:iq:time queries.
    @@ -1364,7 +1386,7 @@ discipline (see A.1.1). -

    A.19  mod_vcard

    +

    A.19  mod_vcard

    This module implements simple Jabber User Directory (based on user vCards) @@ -1406,7 +1428,7 @@ Example: -

    A.20  mod_version

    +

    A.20  mod_version

    This module answers ejabberd version on jabber:iq:version queries.
    @@ -1418,7 +1440,7 @@ discipline (see A.1.1). -

    B  I18n/L10n

    +

    B  I18n/L10n

    All built-in modules support xml:lang attribute inside IQ queries. diff --git a/doc/guide.tex b/doc/guide.tex index 235b26646..665a0a8c4 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -82,7 +82,7 @@ discipline (see~\ref{sec:modiqdiscoption}).} \author{Alexey Shchepin \\ \ahrefurl{mailto:alexey@sevcom.net} \\ \ahrefurl{xmpp:aleksey@jabber.ru}} -\date{May 23, 2005} +\date{July 31, 2005} \begin{document} \begin{titlepage} @@ -649,6 +649,29 @@ Example: \end{verbatim} +\subsubsection{Virtual Host Configuration} +\label{sec:configvirtualhost} + +Options can be defined separately for different virtual hosts using +\term{host\_config} option. It have the have following syntax: +\begin{verbatim} + {host_config, , [