SOURCES: ejabberd-config.patch, ejabberd-makefile.patch - updated ...
jajcus
jajcus at pld-linux.org
Fri Feb 22 15:34:09 CET 2008
Author: jajcus Date: Fri Feb 22 14:34:09 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for ejabberd 2.0.0
---- Files affected:
SOURCES:
ejabberd-config.patch (1.4 -> 1.5) , ejabberd-makefile.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/ejabberd-config.patch
diff -u SOURCES/ejabberd-config.patch:1.4 SOURCES/ejabberd-config.patch:1.5
--- SOURCES/ejabberd-config.patch:1.4 Wed Apr 26 11:32:46 2006
+++ SOURCES/ejabberd-config.patch Fri Feb 22 15:34:04 2008
@@ -1,72 +1,53 @@
-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}]}.
+ %%% 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,
+@@ -374,9 +382,9 @@
+ %% All users are allowed to use MUC service:
+ {access, muc, [{allow, all}]}.
--% 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
+-%% Every username can be registered via in-band registration:
+-%% 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, let the admin decide who will use his server
++%% 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:
-@@ -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}]}.
================================================================
Index: SOURCES/ejabberd-makefile.patch
diff -u SOURCES/ejabberd-makefile.patch:1.2 SOURCES/ejabberd-makefile.patch:1.3
--- SOURCES/ejabberd-makefile.patch:1.2 Wed Apr 26 11:32:46 2006
+++ SOURCES/ejabberd-makefile.patch Fri Feb 22 15:34:04 2008
@@ -1,9 +1,8 @@
-diff -dur -x '*~' ejabberd-1.1.0.orig/src/Makefile.in ejabberd-1.1.0/src/Makefile.in
---- ejabberd-1.1.0.orig/src/Makefile.in 2006-04-01 18:06:36.000000000 +0200
-+++ ejabberd-1.1.0/src/Makefile.in 2006-04-26 10:32:28.000000000 +0200
-@@ -34,13 +34,13 @@
+--- ejabberd-2.0.0/src/Makefile.in.orig 2008-02-21 11:02:12.000000000 +0100
++++ ejabberd-2.0.0/src/Makefile.in 2008-02-22 14:52:47.000000000 +0100
+@@ -50,13 +50,13 @@
- DESTDIR =
+ DESTDIR =
-EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
+EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
@@ -15,6 +14,6 @@
-ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
+LOGDIR = $(DESTDIR)/var/log/ejabberd
+ETCDIR = $(DESTDIR)/etc/jabber
+ SBINDIR = $(DESTDIR)@prefix@/sbin
- ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
-
+ ifeq ($(shell uname),Darwin)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ejabberd-config.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ejabberd-makefile.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list