- updated for ejabberd-1.0.0

[packages/ejabberd.git] / ejabberd-config.patch

diff --git a/ejabberd-config.patch b/ejabberd-config.patch
index ecd04e8beb0e8fc150416ad5643d333e5ec9d485..4ab5f14800c7d2ba4de43b3045aabdd235f2fb3a 100644 (file)
--- a/ejabberd-config.patch
+++ b/ejabberd-config.patch
@@ -1,6 +1,6 @@
-diff -dur ejabberd-0.7.orig/src/ejabberd.cfg.example ejabberd-0.7/src/ejabberd.cfg.example
---- ejabberd-0.7.orig/src/ejabberd.cfg.example 2004-07-11 22:51:50.000000000 +0200
-+++ ejabberd-0.7/src/ejabberd.cfg.example      2004-09-01 11:59:00.267069546 +0200
+diff -dur -x '*~' ejabberd-1.0.0.orig/src/ejabberd.cfg.example ejabberd-1.0.0/src/ejabberd.cfg.example
+--- ejabberd-1.0.0.orig/src/ejabberd.cfg.example       2005-12-08 22:35:15.000000000 +0100
++++ ejabberd-1.0.0/src/ejabberd.cfg.example    2005-12-15 18:36:10.000000000 +0100
 @@ -1,5 +1,11 @@
  % $Id$
  
@@ -13,33 +13,42 @@ diff -dur ejabberd-0.7.orig/src/ejabberd.cfg.example ejabberd-0.7/src/ejabberd.c
  %override_acls.
  
  
-@@ -24,8 +30,9 @@
+@@ -24,10 +30,9 @@
  % Only admins can use configuration interface:
  {access, configure, [{allow, admin}]}.
  
 -% Every username can be registered via in-band registration:
+-% You could replace {allow, all} with {deny, all} to prevent user from using
+-% in-band registration
 -{access, register, [{allow, all}]}.
-+
 +% In-band registration disabled, let the admin decide who will use his server
-+{access, register, [{allow, none}]}.
++% replace "deny, all" with "allow, all" to enable in-band registration
++{access, register, [{deny, all}]}.
  
  % After successful registration user will get message with following subject
  % and body:
-@@ -92,12 +99,25 @@
+@@ -103,18 +108,29 @@
+ 
  % Listened ports:
  {listen,
-  [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper}]},
--  {5223, ejabberd_c2s,     [{access, c2s}, ssl, {certfile, "./ssl.pem"}]},
-+
-+% SSL disabled, enable _after_ providing the certificate
-+% {5223, ejabberd_c2s,     [{access, c2s}, ssl, {certfile, "./ssl.pem"}]},
-+  
+- [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper},
+-                          starttls, {certfile, "./ssl.pem"}]},
+-  {5223, ejabberd_c2s,     [{access, c2s},
+-                          tls, {certfile, "./ssl.pem"}]},
++% TSL disabled, enable _after_ providing the certificate
++ [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper}
++%                            ,starttls, {certfile, "./ssl.pem"}
++                           ]},
++%  {5223, ejabberd_c2s,     [{access, c2s},
++%                         tls, {certfile, "./ssl.pem"}]},
+   % Use these two lines instead if TLS support is not compiled
+   %{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper}]},
+   %{5223, ejabberd_c2s,     [{access, c2s}, ssl, {certfile, "./ssl.pem"}]},
    {5269, ejabberd_s2s_in,  [{shaper, s2s_shaper}]},
 -  {5280, ejabberd_http,    [http_poll, web_admin]},
 -  {8888, ejabberd_service, [{access, all},
 -                          {hosts, ["icq.localhost", "sms.localhost"],
 -                           [{password, "secret"}]}]}
-+
 +% External services. 
 +% To enable more than one you _must_ change port numbers (here and in service's config)
 +%  {5347, ejabberd_service, [{access, all},
@@ -55,4 +64,4 @@ diff -dur ejabberd-0.7.orig/src/ejabberd.cfg.example ejabberd-0.7/src/ejabberd.c
 +  {5280, ejabberd_http,    [http_poll, web_admin]}
   ]}.
  
- % If SRV lookup fails, then port 5269 is used to communicate with remote server
+