diff options
| author | Badlop <badlop@process-one.net> | 2007-12-17 11:03:22 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2007-12-17 11:03:22 +0000 |
| commit | 09a30422f5771012e8f33df77b243307d69c18a4 (patch) | |
| tree | d350f0fcb7ce8c17ac163725d907148dd1f65108 /src | |
| parent | * src/mod_irc/iconv.erl: Changed order of handle_info (diff) | |
* 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
SVN Revision: 1073
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd.cfg.example | 2 | ||||
| -rw-r--r-- | src/ejabberd_listener.erl | 15 | ||||
| -rw-r--r-- | src/msgs/cs.msg | 2 |
3 files changed, 12 insertions, 7 deletions
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"}. |