-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$
-
-+% 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
+@@ -138,14 +144,16 @@
+ %%
+ %% ejabberd_service: Interact with external components (transports...)
+ %%
+- %%{8888, ejabberd_service, [
+- %% {access, all},
+- %% {shaper_rule, fast},
+- %% {ip, {127, 0, 0, 1}},
+- %% {hosts, ["icq.example.org", "sms.example.org"],
+- %% [{password, "secret"}]
+- %% }
+- %% ]},
++ %%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,
+@@ -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:
-@@ -112,22 +117,32 @@
-
- % Listened ports:
- {listen,
-+% 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"}]},
-+% 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},
- {max_stanza_size, 131072}
- ]},
-- {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]}
- ]}.
-
-
-Only in ejabberd-1.1.0/src: ejabberd.cfg.example.orig
-Only in ejabberd-1.1.0/src: ejabberd.cfg.example.rej
+ %% Everybody can create pubsub nodes
+ {access, pubsub_createnode, [{allow, all}]}.
projects / packages / ejabberd.git / blobdiff