- already included in ejabberd 2.0.0

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

diff --git a/ejabberd-config.patch b/ejabberd-config.patch
index 6ac8cd50a001cadb8d7a2a39c30dbf04df454ce3..5a016701cc9e634ca1a6592f708961a6fdd278c2 100644 (file)
--- a/ejabberd-config.patch
+++ b/ejabberd-config.patch
@@ -1,6 +1,6 @@
-diff -dur ejabberd-0.7.5.orig/src/ejabberd.cfg.example ejabberd-0.7.5/src/ejabberd.cfg.example
---- ejabberd-0.7.5.orig/src/ejabberd.cfg.example       2004-10-08 22:40:28.000000000 +0200
-+++ ejabberd-0.7.5/src/ejabberd.cfg.example    2004-10-10 23:49:42.453310527 +0200
+diff -dur -x '*~' ejabberd-1.1.0.orig/src/ejabberd.cfg.example ejabberd-1.1.0/src/ejabberd.cfg.example
+--- ejabberd-1.1.0.orig/src/ejabberd.cfg.example       2006-04-22 15:50:30.000000000 +0200
++++ ejabberd-1.1.0/src/ejabberd.cfg.example    2006-04-26 10:36:38.000000000 +0200
 @@ -1,5 +1,11 @@
  % $Id$
  
@@ -13,36 +13,42 @@ diff -dur ejabberd-0.7.5.orig/src/ejabberd.cfg.example ejabberd-0.7.5/src/ejabbe
  %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:
-@@ -95,18 +102,29 @@
+@@ -112,22 +117,32 @@
  
  % Listened ports:
  {listen,
-- [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper},
++% TSL disabled, enable _after_ providing the certificate
+  [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper},
+                           {max_stanza_size, 65536},
 -                          starttls, {certfile, "./ssl.pem"}]},
 -  {5223, ejabberd_c2s,     [{access, c2s},
+-                          {max_stanza_size, 65536},
 -                          tls, {certfile, "./ssl.pem"}]},
-+% TSL disabled, enable _after_ providing the certificate
-+ [{5222, ejabberd_c2s,     [{access, c2s}, {shaper, c2s_shaper}
-+%                            ,starttls, {certfile, "./ssl.pem"}
-+                           ]},
++%                         starttls, {certfile, "./ssl.pem"}
++                          ]},
 +%  {5223, ejabberd_c2s,     [{access, c2s},
++%                         {max_stanza_size, 65536},
 +%                         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}]},
+   {5269, ejabberd_s2s_in,  [{shaper, s2s_shaper},
+                           {max_stanza_size, 131072}
+                          ]},
 -  {5280, ejabberd_http,    [http_poll, web_admin]},
 -  {8888, ejabberd_service, [{access, all},
 -                          {hosts, ["icq.localhost", "sms.localhost"],
@@ -58,8 +64,9 @@ diff -dur ejabberd-0.7.5.orig/src/ejabberd.cfg.example ejabberd-0.7.5/src/ejabbe
 +%  {5347, ejabberd_service, [{access, all},
 +%                         {hosts, ["ircnet.localhost", "freenode.localhost"],
 +%                          [{password, ">secret<"}]}]},
-+
 +  {5280, ejabberd_http,    [http_poll, web_admin]}
   ]}.
  
- % If SRV lookup fails, then port 5269 is used to communicate with remote server
+ 
+Only in ejabberd-1.1.0/src: ejabberd.cfg.example.orig
+Only in ejabberd-1.1.0/src: ejabberd.cfg.example.rej