mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-19 15:32:08 +02:00
* doc/guide.html: Regenerated
* doc/guide.tex: Fix a problem in SVN merge from trunk SVN Revision: 1605
This commit is contained in:
parent
2f8127d343
commit
10ab4e6782
@ -1,3 +1,7 @@
|
|||||||
|
2008-10-06 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* doc/guide.html: Regenerated
|
||||||
|
|
||||||
2008-10-06 Jerome Sautret <jerome.sautret@process-one.net>
|
2008-10-06 Jerome Sautret <jerome.sautret@process-one.net>
|
||||||
|
|
||||||
* src/ejabberd_rdbms.erl: fix SQL database reconnection
|
* src/ejabberd_rdbms.erl: fix SQL database reconnection
|
||||||
|
@ -514,7 +514,7 @@ indicates you need to also update those tables.</P><P> <A NAME="configure"></A>
|
|||||||
<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc20">3.1</A>  <A HREF="#basicconfig">Basic Configuration</A></H2><!--SEC END --><P> <A NAME="basicconfig"></A> </P><P>The configuration file will be loaded the first time you start <TT>ejabberd</TT>. The
|
<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc20">3.1</A>  <A HREF="#basicconfig">Basic Configuration</A></H2><!--SEC END --><P> <A NAME="basicconfig"></A> </P><P>The configuration file will be loaded the first time you start <TT>ejabberd</TT>. The
|
||||||
content from this file will be parsed and stored in the internal <TT>ejabberd</TT> database. Subsequently the
|
content from this file will be parsed and stored in the internal <TT>ejabberd</TT> database. Subsequently the
|
||||||
configuration will be loaded from the database and any commands in the
|
configuration will be loaded from the database and any commands in the
|
||||||
configuration file are appended to the entries in the database. </P><P>Note that <TT>ejabberd</TT> never edits the configuration file.
|
configuration file are appended to the entries in the database.</P><P>Note that <TT>ejabberd</TT> never edits the configuration file.
|
||||||
So, the configuration changes done using the Web Admin
|
So, the configuration changes done using the Web Admin
|
||||||
are stored in the database, but are not reflected in the configuration file.
|
are stored in the database, but are not reflected in the configuration file.
|
||||||
If you want those changes to be use after <TT>ejabberd</TT> restart, you can either
|
If you want those changes to be use after <TT>ejabberd</TT> restart, you can either
|
||||||
@ -1262,6 +1262,9 @@ to keep alive the connections to the database.
|
|||||||
The default value is ’undefined’, so no keepalive requests are made.
|
The default value is ’undefined’, so no keepalive requests are made.
|
||||||
Specify in seconds: for example 28800 means 8 hours.
|
Specify in seconds: for example 28800 means 8 hours.
|
||||||
</P><PRE CLASS="verbatim">{odbc_keepalive_interval, undefined}.
|
</P><PRE CLASS="verbatim">{odbc_keepalive_interval, undefined}.
|
||||||
|
</PRE><P>If the connection to the database fails, <TT>ejabberd</TT> waits 30 seconds before retrying.
|
||||||
|
You can modify this interval with this option:
|
||||||
|
</P><PRE CLASS="verbatim">{odbc_start_interval, 30}.
|
||||||
</PRE><P> <A NAME="compilemysql"></A> </P><!--TOC subsubsection Driver Compilation-->
|
</PRE><P> <A NAME="compilemysql"></A> </P><!--TOC subsubsection Driver Compilation-->
|
||||||
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#compilemysql">Driver Compilation</A></H4><!--SEC END --><P> <A NAME="compilemysql"></A>
|
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#compilemysql">Driver Compilation</A></H4><!--SEC END --><P> <A NAME="compilemysql"></A>
|
||||||
</P><P>You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
|
</P><P>You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
|
||||||
|
Loading…
Reference in New Issue
Block a user