diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | doc/guide.tex | 8 | ||||
| -rw-r--r-- | src/ejabberd.cfg.example | 2 | ||||
| -rw-r--r-- | src/ejabberd_listener.erl | 15 | ||||
| -rw-r--r-- | src/msgs/cs.msg | 2 |
5 files changed, 26 insertions, 14 deletions
@@ -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> * src/mod_irc/iconv.erl: Changed order of handle_info clause (EJAB-290) - * src/stringprep/stringprep.erl: Likesise + * src/stringprep/stringprep.erl: Likewise * src/eldap/eldap.erl: Removed handle_sync_event clause because it is never called (EJAB-290) diff --git a/doc/guide.tex b/doc/guide.tex index 06825295..c083fcdd 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -582,7 +582,7 @@ Example: \end{verbatim} \end{itemize} -\subsection{Listened Sockets} +\subsection{Listening Ports} \label{listened} \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}|} \hline \texttt{ejabberd\_c2s}& Description& Handles c2s connections.\\ \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{zlib}\\ \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 shaper for the port (see section~\ref{shapers}). The default value 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 specifies that STARTTLS encryption is available on connections to the port. You should also set the \option{certfile} option. diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example index 032c0f15..8e957f38 100644 --- a/src/ejabberd.cfg.example +++ b/src/ejabberd.cfg.example @@ -126,7 +126,7 @@ %%{5223, ejabberd_c2s, [ %% {access, c2s}, %% {shaper, c2s_shaper}, - %% tls, {certfile, "/path/to/ssl.pem"}, + %% {certfile, "/path/to/ssl.pem"}, tls, %% {max_stanza_size, 65536} %% ]}, diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index a7b1503d..808896e2 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -43,15 +43,20 @@ init(_) -> 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 - {value, {ssl, SSLOpts}} -> - {ok, proc_lib:spawn_link(?MODULE, init_ssl, - [Port, Module, Opts, SSLOpts])}; + {value, {ssl, _SSLOpts}} -> + %%{ok, proc_lib:spawn_link(?MODULE, init_ssl, + %% [Port, Module, Opts, SSLOpts])}; + ?ERROR_MSG(SSLError, []), + {error, SSLError}; _ -> case lists:member(ssl, Opts) of true -> - {ok, proc_lib:spawn_link(?MODULE, init_ssl, - [Port, Module, Opts, []])}; + %%{ok, proc_lib:spawn_link(?MODULE, init_ssl, + %% [Port, Module, Opts, []])}; + ?ERROR_MSG(SSLError, []), + {error, SSLError}; false -> {ok, proc_lib:spawn_link(?MODULE, init, [Port, Module, Opts])} diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg index 5ec105d9..5e532c16 100644 --- a/src/msgs/cs.msg +++ b/src/msgs/cs.msg @@ -106,7 +106,7 @@ {"Specified nickname is already registered", "Zadaná přezdívka je již zaregistrována"}. % 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"}. {"Configuration for ", "Konfigurace pro "}. {"Room title", "Název místnosti"}. |