* doc/guide.tex: Updated

* src/msgs/fr.msg: Updated (thanks to Sergei Golovan)

* src/mod_irc/mod_irc.erl: Added handler for disco items requests
(thanks to Sergei Golovan)

* src/mod_vcard.erl: Added option for JUD disabling (thanks to
Sergei Golovan)

* src/mod_configure2.erl: Fixed module stopping (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise
* src/mod_privacy.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_vcard.erl: Likewise

* src/jd2ejd.erl: Added emergency catches (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise

* src/ejabberd_sm.erl: Removed needless call to
mod_disco:unregister_feature (thanks to Sergei Golovan)

* src/ejabberd_local.erl: Better support for mod_disco (thanks to
Sergei Golovan)
* src/mod_disco.erl: Likewise

* src/translate.erl: Suport for "default language" option (thanks
to Sergei Golovan)
* src/ejabberd_config.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd.hrl: Added 'MYLANG' macros

* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)

* doc/guide.tex: Updated (thanks to Sergei Golovan)

* src/win32/ejabberd.cfg: Updated (thanks to Sergei Golovan)

SVN Revision: 241

1 files changed, 37 insertions, 32 deletions

diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg
index 2aa6788b..1e2b2081 100644
--- a/src/win32/ejabberd.cfg
+++ b/src/win32/ejabberd.cfg
@@ -64,6 +64,9 @@
 % Admins of this server are also admins of MUC service:
 {access, muc_admin, [{allow, admin}]}.
 
+% All users are allowed to use MUC service:
+{access, muc, [{allow, all}]}.
+
 % This rule allows access only for local users:
 {access, local, [{allow, local}]}.
 
@@ -84,44 +87,46 @@
 
 
 % Listened ports:
-{listen, [{5222, ejabberd_c2s,     [{access, c2s},
-				    {shaper, c2s_shaper}]},
-%	  {5223, ejabberd_c2s,     [{access, c2s},
-%				    {ssl, [{certfile, "./cert.pem"}]}]},
-          {5269, ejabberd_s2s_in,  [{shaper, s2s_shaper}]}%,
-%	  {5555, ejabberd_service, [{host, "icq.localhost", [{password, "someSecret"}]}]},
-%          {8888, ejabberd_service, [%{access, local},
-%				    {hosts,
-%				     ["conference.e.localhost",
-%				      "muc.e.localhost"],
-%				     [{password, "secret"}]}]}
-         ]}.
+{listen,
+ [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper}]},
+%  {5223, ejabberd_c2s,     [{access, c2s}, ssl, {certfile, "./ssl.pem"}]},
+  {5269, ejabberd_s2s_in,  [{shaper, s2s_shaper}]},
+%  {5555, ejabberd_service, [{access, all},
+%			    {host, "icq.localhost", [{password, "secret"}]}]},
+  {5280, ejabberd_http,    [http_poll, web_admin]}
+ ]}.
 
 % If SRV lookup fails, then port 5269 is used to communicate with remote server
 {outgoing_s2s_port, 5269}.
 
 
 % Used modules:
-{modules, [
-           {mod_register,  []},
-           {mod_roster,    []},
-           {mod_privacy,   []},
-           {mod_configure, []},
-           {mod_disco,     []},
-           {mod_stats,     []},
-           {mod_vcard,     []},
-           {mod_offline,   []},
-           {mod_echo,      [{host, "echo.localhost"}]},
-           {mod_private,   []},
-           {mod_irc,       []},
-           {mod_muc,       []},
-           {mod_pubsub,    []},
-           {mod_time,      []},
-           {mod_last,      []},
-           {mod_version,   []}
-          ]}.
-
-
+{modules,
+ [
+  {mod_register,  []},
+  {mod_roster,    []},
+  {mod_privacy,   []},
+  {mod_configure, []},
+  {mod_disco,     []},
+  {mod_stats,     []},
+  {mod_vcard,     []},
+  {mod_offline,   []},
+  {mod_private,   []},
+  {mod_irc,       []},
+  {mod_muc,       []},
+% Default options for mod_muc:
+%   host: "conference." ++ ?MYNAME
+%   access: all
+%   access_create: all
+%   access_admin: none (only room creator has owner privileges)
+  {mod_muc,        [{access, muc},
+		    {access_create, muc},
+		    {access_admin, muc_admin}]},
+  {mod_pubsub,    []},
+  {mod_time,      []},
+  {mod_last,      []},
+  {mod_version,   []}
+ ]}.
 
 
 % Local Variables: