- rebuild with expat 2.1.0

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

diff --git a/ejabberd-config.patch b/ejabberd-config.patch
index 4ab5f14800c7d2ba4de43b3045aabdd235f2fb3a..f04f706f3390143b54ddd1c3a7907e41635d69f5 100644 (file)
--- a/ejabberd-config.patch
+++ b/ejabberd-config.patch
@@ -1,67 +1,46 @@
-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$
- 
-+% This is a setup for working "localhost" server.
-+% To make fully functional world-accessible Jabber server you will need to:
-+% - change 'localhost' everywhere below to your desired Jabber server domain name
-+% - provide SSL certificates and uncomment ssl settings
-+% - modify everything else according to your needs
+--- ejabberd-2.0.0/src/ejabberd.cfg.example.orig       2008-02-21 11:02:12.000000000 +0100
++++ ejabberd-2.0.0/src/ejabberd.cfg.example    2008-02-22 14:57:55.000000000 +0100
+@@ -2,6 +2,12 @@
+ %%%               ejabberd configuration file
+ %%%
+ 
++%%% This is a setup for working "localhost" server.
++%%% To make fully functional world-accessible Jabber server you will need to:
++%%% - change 'localhost' everywhere below to your desired Jabber server domain name
++%%% - provide SSL certificates and uncomment ssl settings
++%%% - modify everything else according to your needs
 +
- %override_acls.
- 
- 
-@@ -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
+ %%% The parameters used in this configuration file are explained in more detail
+ %%% in the ejabberd Installation and Operation Guide.
+ %%% Please consult the Guide in case of doubts, it is included in 
+@@ -155,6 +155,17 @@
+   %%                      }
+   %%                     ]},
+ 
++  %%To enable more than one you _must_ change port numbers (here and in service's config)
++  %% {5347, ejabberd_service, [{access, all},
++  %%                   {hosts, ["icq.localhost", "sms.localhost"],
++  %%                   [{password, ">secret<"}]}]},
++  %% {5347, ejabberd_service, [{access, all},
++  %%                   {host, "gg.localhost",
++  %%                   [{password, ">secret<"}]}]},
++  %% {5347, ejabberd_service, [{access, all},
++  %%                   {hosts, ["ircnet.localhost", "freenode.localhost"],
++  %%                    [{password, ">secret<"}]}]},
++
+   {5280, ejabberd_http, [
+                        %%{request_handlers,
+                        %% [
+@@ -391,9 +391,9 @@
+ %% All users are allowed to use MUC service:
+ {access, muc, [{allow, all}]}.
+ 
+-%% In-band registration allows registration of any possible username.
+-%% To disable in-band registration, replace 'allow' with 'deny'.
 -{access, register, [{allow, all}]}.
-+% In-band registration disabled, let the admin decide who will use his server
-+% replace "deny, all" with "allow, all" to enable in-band registration
++%% In-band registration disabled.
++%% To enable  in-band registration, replace 'deny' with 'allow'.
 +{access, register, [{deny, all}]}.
  
- % After successful registration user will get message with following subject
- % and body:
-@@ -103,18 +108,29 @@
- 
- % Listened ports:
- {listen,
-- [{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},
-+%                         {hosts, ["icq.localhost", "sms.localhost"],
-+%                          [{password, ">secret<"}]}]},
-+%  {5347, ejabberd_service, [{access, all},
-+%                         {host, "gg.localhost",
-+%                          [{password, ">secret<"}]}]},
-+%  {5347, ejabberd_service, [{access, all},
-+%                         {hosts, ["ircnet.localhost", "freenode.localhost"],
-+%                          [{password, ">secret<"}]}]},
-+
-+  {5280, ejabberd_http,    [http_poll, web_admin]}
-  ]}.
- 
- 
+ %% Everybody can create pubsub nodes
+ {access, pubsub_createnode, [{allow, all}]}.