Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

* doc/guide.tex: Remove 'ssl' option from documentation and

Browse Source 
configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise

* src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
Spike411)

* src/ejabberd.cfg.example: Small change in order of options

SVN Revision: 1073
This commit is contained in:
Badlop 2007-12-17 11:03:22 +00:00
parent 2b91ebcc85
commit 09a30422f5
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,8 +1,19 @@
2007-12-17 Badlop <badlop@process-one.net>
* doc/guide.tex: Remove 'ssl' option from documentation and
configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise
* src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
Spike411)
* src/ejabberd.cfg.example: Small change in order of options
2007-12-15 Badlop <badlop@process-one.net> 2007-12-15 Badlop <badlop@process-one.net>
* src/mod_irc/iconv.erl: Changed order of handle_info * src/mod_irc/iconv.erl: Changed order of handle_info
clause (EJAB-290) clause (EJAB-290)
* src/stringprep/stringprep.erl: Likesise * src/stringprep/stringprep.erl: Likewise
* src/eldap/eldap.erl: Removed handle_sync_event clause because it * src/eldap/eldap.erl: Removed handle_sync_event clause because it
is never called (EJAB-290) is never called (EJAB-290)

8
doc/guide.tex
View File

@ -582,7 +582,7 @@ Example:
\end{verbatim} \end{verbatim}
\end{itemize} \end{itemize}
\subsection{Listened Sockets} \subsection{Listening Ports}
\label{listened} \label{listened}
\ind{options!listen} \ind{options!listen}
@ -603,7 +603,7 @@ The available modules, their purpose and the options allowed by each one are:
\begin{tabular}{|l|l|p{87mm}|} \begin{tabular}{|l|l|p{87mm}|}
\hline \texttt{ejabberd\_c2s}& Description& Handles c2s connections.\\ \hline \texttt{ejabberd\_c2s}& Description& Handles c2s connections.\\
\cline{2-3} & Options& \texttt{access}, \texttt{certfile}, \texttt{inet6}, \cline{2-3} & Options& \texttt{access}, \texttt{certfile}, \texttt{inet6},
\texttt{ip}, \texttt{max\_stanza\_size}, \texttt{shaper}, \texttt{ssl}, \texttt{ip}, \texttt{max\_stanza\_size}, \texttt{shaper},
\texttt{starttls}, \texttt{starttls\_required}, \texttt{tls}, \texttt{starttls}, \texttt{starttls\_required}, \texttt{tls},
\texttt{zlib}\\ \texttt{zlib}\\
\hline \texttt{ejabberd\_s2s\_in}& Description& Handles incoming s2s \hline \texttt{ejabberd\_s2s\_in}& Description& Handles incoming s2s
@ -669,10 +669,6 @@ This is a detailed description of each option allowed by the listening modules:
\titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a \titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a
shaper for the port (see section~\ref{shapers}). The default value shaper for the port (see section~\ref{shapers}). The default value
is \term{none}. is \term{none}.
\titem{ssl} \ind{options!ssl}\ind{SSL}This option specifies that traffic on
the port will be encrypted using SSL. You should also set the
\option{certfile} option. It is recommended to use the \term{tls} option
instead of this one.
\titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option \titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option
specifies that STARTTLS encryption is available on connections to the port. specifies that STARTTLS encryption is available on connections to the port.
You should also set the \option{certfile} option. You should also set the \option{certfile} option.

2
src/ejabberd.cfg.example
View File

@ -126,7 +126,7 @@
%%{5223, ejabberd_c2s, [ %%{5223, ejabberd_c2s, [
%% {access, c2s}, %% {access, c2s},
%% {shaper, c2s_shaper}, %% {shaper, c2s_shaper},
%% tls, {certfile, "/path/to/ssl.pem"}, %% {certfile, "/path/to/ssl.pem"}, tls,
%% {max_stanza_size, 65536} %% {max_stanza_size, 65536}
%% ]}, %% ]},

15
src/ejabberd_listener.erl
View File

@ -43,15 +43,20 @@ init(_) ->
start(Port, Module, Opts) -> start(Port, Module, Opts) ->
SSLError = "There is a problem with your ejabberd configuration file: the option 'ssl' for listening sockets is no longer available. To get SSL encryption use the option 'tls'.",
case lists:keysearch(ssl, 1, Opts) of case lists:keysearch(ssl, 1, Opts) of
{value, {ssl, SSLOpts}} -> {value, {ssl, _SSLOpts}} ->
{ok, proc_lib:spawn_link(?MODULE, init_ssl, %%{ok, proc_lib:spawn_link(?MODULE, init_ssl,
[Port, Module, Opts, SSLOpts])}; %% [Port, Module, Opts, SSLOpts])};
?ERROR_MSG(SSLError, []),
{error, SSLError};
_ -> _ ->
case lists:member(ssl, Opts) of case lists:member(ssl, Opts) of
true -> true ->
{ok, proc_lib:spawn_link(?MODULE, init_ssl, %%{ok, proc_lib:spawn_link(?MODULE, init_ssl,
[Port, Module, Opts, []])}; %% [Port, Module, Opts, []])};
?ERROR_MSG(SSLError, []),
{error, SSLError};
false -> false ->
{ok, proc_lib:spawn_link(?MODULE, init, {ok, proc_lib:spawn_link(?MODULE, init,
[Port, Module, Opts])} [Port, Module, Opts])}

2
src/msgs/cs.msg
View File

@ -106,7 +106,7 @@
{"Specified nickname is already registered", "Zadaná přezdívka je již zaregistrována"}. {"Specified nickname is already registered", "Zadaná přezdívka je již zaregistrována"}.
% mod_muc/mod_muc_room.erl % mod_muc/mod_muc_room.erl
{" has set the subject to: ", "změnil(a) téma na: "}. {" has set the subject to: ", " změnil(a) téma na: "}.
{"You need an x:data capable client to configure room", "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}. {"You need an x:data capable client to configure room", "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}.
{"Configuration for ", "Konfigurace pro "}. {"Configuration for ", "Konfigurace pro "}.
{"Room title", "Název místnosti"}. {"Room title", "Název místnosti"}.