diff -BruNa smeserver-ejabberd-2.0.0-1/createlinks smeserver-ejabberd-2.0.0-2/createlinks --- smeserver-ejabberd-2.0.0-1/createlinks 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/createlinks 2008-05-18 23:37:19.000000000 +0200 @@ -2,7 +2,7 @@ use esmith::Build::CreateLinks qw(:all); -templates2events("/opt/ejabberd/conf/ejabberd.cfg", qw( +templates2events("/etc/ejabberd/ejabberd.cfg", qw( console-save bootstrap-console-save user-create @@ -12,17 +12,12 @@ ejabberd-update )); -templates2events("/opt/ejabberd/conf/ssl.pem/pem", qw( - console-save - bootstrap-console-save - ldap-update - domain-modify - ejabberd-update - )); - # not really good setting of logrotate before starting ejabberd -# but works for contrib or core intyegration -templates2events("/etc/logrotate.d/proftpd", "ejabberd-update"); +# but works for contrib or core integration +templates2events("/etc/logrotate.d/ejabberd", "ejabberd-update"); + +# add ejabberd code to rc.local +templates2events("/etc/rc.d/rc.local", "bootstrap-console-save"); #-------------------------------------------------- # pre-backup actions @@ -32,21 +27,6 @@ event_link("ejabberd-delete-dumped-tables", $event, "11"); event_link("ejabberd-dump-tables", $event, "21"); -#-------------------------------------------------- -# post-backup actions -#-------------------------------------------------- -$event = "post-backup"; - -# Probably don't really need to do this -event_link("ejabberd-delete-dumped-tables", $event, "11"); - -#-------------------------------------------------- -# actions for bootstrap-console-save event -#-------------------------------------------------- -$event = "bootstrap-console-save"; - -event_link("ejabberd-load-tables", $event, "41"); - foreach $event (qw( network-create network-delete @@ -68,6 +48,8 @@ service_link_enhanced("ejabberd", "K25", "6"); service_link_enhanced("ejabberd", "K25", "1"); service_link_enhanced("ejabberd", "K25", "0"); +service_link_enhanced("ejabberd.init", "S99", "7"); + templates2events("/etc/rc.d/init.d/masq", "ejabberd-update"); safe_symlink("adjust", "root/etc/e-smith/events/ejabberd-update/services2adjust/masq"); diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status 2008-05-20 02:16:27.000000000 +0200 @@ -0,0 +1 @@ +enabled \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type 2008-05-20 02:16:18.000000000 +0200 @@ -0,0 +1 @@ +service \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-dump-tables smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-dump-tables --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-dump-tables 2008-05-08 10:21:04.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-dump-tables 2008-05-18 22:05:34.000000000 +0200 @@ -7,4 +7,5 @@ exit 0 fi mkdir -p /home/e-smith/db/ejabberd +chown ejabberd.root /home/e-smith/db/ejabberd /sbin/e-smith/ejabberdctl backup /home/e-smith/db/ejabberd/ejabberd.backup \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-load-tables smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-load-tables --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-load-tables 2008-05-08 10:21:36.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-load-tables 2008-05-18 22:59:41.000000000 +0200 @@ -14,6 +14,5 @@ exit 0 fi /sbin/e-smith/ejabberdctl restore /home/e-smith/db/ejabberd/ejabberd.backup - rm -f /home/e-smith/db/ejabberd/ejabberd.backup fi fi \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,8 @@ +{ + $OUT =<<'HERE'; +% Users that have admin access. Add line like one of the following after you +% will be successfully registered on server to get admin access: +{acl, admin, {user, "admin"}}. +HERE +} + diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,19 @@ +{ + $OUT =<<'HERE'; +% Blocked users: +%{acl, blocked, {user, "test"}}. +HERE + use esmith::AccountsDB; + my $adb = esmith::AccountsDB->open_ro(); + my $users; + foreach $u ( grep { $_->prop("PasswordSet") ne 'yes' } $adb->users() ) { + $users .= ("^". $u->key() .'$|'); + } + if ($users) { + chop $users; + $OUT .= ( '{acl, blocked, {user_regexp,"' . $users ); + $OUT .= '"}}.'; + $OUT .= "\n"; + } + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers 2007-09-20 16:12:29.000000000 +0200 @@ -0,0 +1,7 @@ +{ + $OUT =<<'HERE'; +% Local users: +{acl, local, {user_regexp, ""}}. + +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,19 @@ +{ + $OUT =<<'HERE'; +% SME server Local users: +HERE + use esmith::AccountsDB; + my $adb = esmith::AccountsDB->open_ro(); + my $users; + foreach $u ($adb->activeUsers()) { + $users .= ("\^" . $u->key() . '$|'); + } + if (defined $users) { + chop $users; + $OUT .= '{acl, smeusers, {user_regexp,"'; + $OUT .= $users; + $OUT .= '"}}.'; + $OUT .= "\n"; + } + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,7 @@ +{ + $OUT =<<'HERE'; +% Everybody can create pubsub nodes +{access, pubsub_createnode, [{allow, all}]}. +HERE +} + diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess 2007-09-20 16:12:29.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT =<<'HERE'; +% Only admins can use configuration interface: +{access, configure, [{allow, admin}]}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration 2007-09-28 11:04:50.000000000 +0200 @@ -0,0 +1,14 @@ +{ + $OUT =<<'HERE'; +% 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 +HERE + $OUT .= '{access, register, [{'; + my $perm = 'deny,all'; + $perm = 'allow,all' if ( ${ejabberd}{Register} eq 'all' ); + $perm = 'allow,smeusers' if ( ${ejabberd}{Register} eq 'smeusers' ); + $OUT .= $perm; + $OUT .= '}]}.'; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg 2007-09-26 06:38:00.000000000 +0200 @@ -0,0 +1,26 @@ +{ + $OUT =<<'HERE'; +% After successful registration user will get message with following subject +% and body: +%{welcome_message, +% {"Welcome!", +% "Welcome to Instant Messaging server localhost. " +% "For information about ejabberd visit http://www.process-one.net/"}}. +% Replace them with 'none' if you don't want to send such message: +HERE + $OUT .= '{welcome_message, '; + $OUT .= "\n"; + if ( (defined ${ejabberd}{WelcomeSubject}) && ( ${ejabberd}{WelcomeSubject} ne '') ){ + $OUT .= ('{"'.${ejabberd}{WelcomeSubject}.'",'); + foreach $line ( split /\n/, ${ejabberd}{WelcomeText} ) { + $OUT .= ('"'.$line.'"'); + $OUT .= "\n"; + } + $OUT .= '}'; + } + else { + $OUT .= 'none'; + } + $OUT .= '}.'; + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify 2007-09-25 03:16:20.000000000 +0200 @@ -0,0 +1,14 @@ +{ + $OUT =<<'HERE'; +% List of people who will get notifications about registered users +%{registration_watchers, ["admin1@test.leclere.homeip.com", +% "admin2@test.leclere.homeip.com"]}. +HERE + if ( ${ejabberd}{Notify} eq 'enabled' ) { + $OUT .= '{registration_watchers, ["admin@'; + $OUT .= ${DomainName}; + $OUT .= ']}'; + } + $OUT .= "\n"; +} + diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT =<<'HERE'; +% Only admins can send announcement messages : +{access, announce, [{allow, admin}]}. +HERE +} \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf 2007-09-20 16:12:29.000000000 +0200 @@ -0,0 +1,23 @@ +{ + $OUT =<<'HERE'; +% Only non-blocked users can use c2s connections: +{access, c2s, [{deny, blocked}, + {allow, all}]}. + +% Set shaper with name "normal" to limit traffic speed to 1000B/s +{shaper, normal, {maxrate, 1000}}. + +% Set shaper with name "fast" to limit traffic speed to 50000B/s +{shaper, fast, {maxrate, 50000}}. + +% For all users except admins used "normal" shaper +{access, c2s_shaper, [{none, admin}, + {normal, all}]}. + +% For all S2S connections used "fast" shaper +{access, s2s_shaper, [{fast, all}]}. + +% Admins of this server are also admins of MUC service: +{access, muc_admin, [{allow, admin}]}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess 2008-05-09 00:28:36.000000000 +0200 @@ -0,0 +1,8 @@ +{ + $OUT =<<'HERE'; +% All users are allowed to use MUC service: +{access, muc, [{allow, all}]}. +{access, muc_log, [{allow, admin}, {deny, all}]}. +HERE +} + diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess 2007-09-20 16:12:29.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT =<<'HERE'; +% Allow access only for local users: +{access, local, [{allow, local}]}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,7 @@ +{ + $OUT =<<'HERE'; +% Authentication method. If you want to use internal user base, then use +% this line: +{auth_method, internal}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,9 @@ +{ + $OUT =<<'HERE'; +% Host name: +HERE + $OUT .= '{hosts, ["'; + $OUT .= ${ejabberd}{Domain}; + $OUT .= '"]}.'; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT =<<'HERE'; +%% Define the maximum number of time a single user is allowed to connect: +{max_user_sessions, 10}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,13 @@ +{ + $OUT =<<'HERE'; +%% Anonymous login support: +%% auth_method: anonymous +%% anonymous_protocol: sasl_anon|login_anon|both +%% allow_multiple_connections: true|false +%%{host_config, "public.example.org", [{auth_method, anonymous}, +%% {allow_multiple_connections, false}, +%% {anonymous_protocol, sasl_anon}]}. +%% To use both anonymous and internal authentication: +%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,9 @@ +{ + $OUT =<<'HERE'; +% Default language for server messages +HERE + $OUT .= '{language, "'; + $OUT .= substr(${sysconfig}{Language}, 0, 2); + $OUT .= '"}.'; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,4 @@ +{ + $OUT .= "% Listened ports:\n"; + $OUT .= "\{listen, ["; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s 2008-05-15 12:52:44.000000000 +0200 @@ -0,0 +1,33 @@ +{ + $OUT =<<'HERE'; + %%{5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, + %% Use this line to enable SSL: + %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/server.pem"}]}, + %% + %% Use those lines instead for TLS support: + %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/home/e-smith/server.pem"}]}, + %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/server.pem"}]}, + +HERE + if ( ${ejabberd}{XMPPAccess} eq 'tls' ) { + $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/home/e-smith/ssl.pem/'; + $OUT .= ${SystemName}; + $OUT .= ('.' . ${DomainName}); + $OUT .= '.pem"}]},'; + $OUT .= "\n"; + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/ssl.pem/'; + $OUT .= ${SystemName}; + $OUT .= ('.' . ${DomainName}); + $OUT .= '.pem"}]}'; + $OUT .= "\n\n"; + } + else { + $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]},'; + $OUT .= "\n"; + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/ssl.pem/'; + $OUT .= ${SystemName}; + $OUT .= ('.' . ${DomainName}); + $OUT .= '.pem"}]}'; + $OUT .= "\n\n"; + } +} \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT .=' %% Remove this line if you want to prevent s2s connections:'; + $OUT .= "\n"; + $OUT .= ' ,{5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}'; + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http 2008-05-15 12:51:06.000000000 +0200 @@ -0,0 +1,13 @@ +{ + $OUT .= ' %% remove http_poll to remove support for http polling'; + $OUT .= "\n"; + $OUT .= ' %% remove web_admin to disable admin interface:'; + $OUT .= "\n"; + $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/home/e-smith/ssl.pem/'; + $OUT .= ${SystemName}; + $OUT .= ('.' . ${DomainName}); + $OUT .= '.pem"}, http_poll'; + $OUT .= ', web_admin' if (${ejabberd}{WebAdmin} eq 'enabled'); + $OUT .= ']}'; + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,10 @@ +{ + $OUT .= ' %% This is an example on how to define an external service/transport:'; + $OUT .= "\n"; + $OUT .= ' %%,{8888, ejabberd_service, [{access, all},'; + $OUT .= "\n"; + $OUT .= ' %% {hosts, ["icq.test.leclere.homeip.com", "sms.test.leclere.homeip.com"],'; + $OUT .= "\n"; + $OUT .= ' %% [{password, "secret"}]}]}'; + $OUT .= "\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,4 @@ +{ + $OUT .= " ]\}."; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut 2008-05-06 10:23:43.000000000 +0200 @@ -0,0 +1,6 @@ +{ + $OUT .= '% If SRV lookup fails, then port 5269 is used to communicate with remote server'; + $OUT .= "\n"; + $OUT .= '{outgoing_s2s_port, 5269}.'; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules 2008-05-09 00:38:26.000000000 +0200 @@ -0,0 +1,41 @@ +{ + $OUT =<<'HERE'; +% Used modules: +{modules, + [ + {mod_register, [{access, register}]}, + {mod_roster, []}, + {mod_privacy, []}, + {mod_adhoc, []}, + {mod_configure, []}, % Depends on mod_adhoc + {mod_configure2, []}, + {mod_disco, []}, + {mod_stats, []}, + {mod_vcard, []}, + {mod_caps, []}, + {mod_offline, []}, + {mod_announce, [{access, announce}]}, % Depends on mod_adhoc + {mod_private, []}, + {mod_irc, []}, +% Default options for mod_muc: +% host: "conference." ++ ?MYNAME +% access: all +% access_create: all +% access_admin: none (only room creator has owner privileges) + {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, + {mod_muc_log, []}, + {mod_shared_roster, []}, + {mod_pubsub, [{access_createnode, pubsub_createnode}]}, + {mod_time, []}, + {mod_last, []}, +% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, + {mod_version, []}, + {mod_ctlextra, []}, +HERE + $OUT .= ' {mod_echo, [{host, "echo.'; + $OUT .= ${DomainName}; + $OUT .= '"}]}'; + $OUT .= "\n"; + $OUT .= ' ]}.'; + $OUT .= "\n\n"; +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-begin smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-begin --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-begin 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-begin 2007-09-29 07:39:44.000000000 +0200 @@ -0,0 +1,9 @@ +{ + $OUT =<<'HERE'; +% $Id: smeserver-ejabberd-2.0.0-removeOpt.patch,v 1.2 2008/05/22 19:43:08 gnujpl Exp $ + +override_acls. +override_global. +override_local. +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-end smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-end --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-end 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/template-end 2007-09-20 16:12:30.000000000 +0200 @@ -0,0 +1,7 @@ +{ + $OUT =<<'HERE'; +% Local Variables: +% mode: erlang +% End: +HERE +} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/e-smith/mnesia/init/00_restore_dumped_dbs smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/e-smith/mnesia/init/00_restore_dumped_dbs --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/e-smith/mnesia/init/00_restore_dumped_dbs 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/e-smith/mnesia/init/00_restore_dumped_dbs 2008-05-22 22:04:48.000000000 +0200 @@ -0,0 +1,28 @@ +#! /bin/sh + + +for i in $(seq 1 20); +do + sv check /service/ejabberd | grep -q 'ok: run:' + if [ $? -eq 0 ] + then + for j in $(seq 1 30); + do + if [ -f /var/lib/ejabberd/spool/passwd.DCD ] + then + ls -lt -c /var/lib/ejabberd/spool > /tmp/spoolls-$i$j-last + sleep 5 + /etc/e-smith/events/actions/ejabberd-load-tables + exit 0 + fi + sleep 2 + done + echo seems service ejabberd started with errors + exit 1 + fi + echo waiting for service ejabberd to start + sleep 1 +done +echo ejabberd failed to start +exit 1 + diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/logrotate.d/ejabberd/var.log.ejabberd smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/logrotate.d/ejabberd/var.log.ejabberd --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/logrotate.d/ejabberd/var.log.ejabberd 2007-09-30 14:59:09.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/logrotate.d/ejabberd/var.log.ejabberd 2008-05-18 23:47:30.000000000 +0200 @@ -8,6 +8,6 @@ create 0644 ejabberd ejabberd sharedscripts postrotate - sudo -u ejabberd -H /opt/ejabberd/bin/ejabberdctl reopen-log >/dev/null 2>/dev/null || true + sudo -u ejabberd -H /sbin/e-smith/ejabberdctl reopen-log >/dev/null 2>/dev/null || true endscript \} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/10AdminUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/10AdminUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/10AdminUsers 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/10AdminUsers 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -{ - $OUT =<<'HERE'; -% Users that have admin access. Add line like one of the following after you -% will be successfully registered on server to get admin access: -{acl, admin, {user, "admin"}}. -HERE -} - diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/15BlockedUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/15BlockedUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/15BlockedUsers 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/15BlockedUsers 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -{ - $OUT =<<'HERE'; -% Blocked users: -%{acl, blocked, {user, "test"}}. -HERE - use esmith::AccountsDB; - my $adb = esmith::AccountsDB->open_ro(); - my $users; - foreach $u ( grep { $_->prop("PasswordSet") ne 'yes' } $adb->users() ) { - $users .= ("^". $u->key() .'$|'); - } - if ($users) { - chop $users; - $OUT .= ( '{acl, blocked, {user_regexp,"' . $users ); - $OUT .= '"}}.'; - $OUT .= "\n"; - } - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/18LocalUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/18LocalUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/18LocalUsers 2007-09-20 16:12:29.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/18LocalUsers 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -{ - $OUT =<<'HERE'; -% Local users: -{acl, local, {user_regexp, ""}}. - -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/19SMEUsers smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/19SMEUsers --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/19SMEUsers 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/19SMEUsers 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -{ - $OUT =<<'HERE'; -% SME server Local users: -HERE - use esmith::AccountsDB; - my $adb = esmith::AccountsDB->open_ro(); - my $users; - foreach $u ($adb->activeUsers()) { - $users .= ("\^" . $u->key() . '$|'); - } - if (defined $users) { - chop $users; - $OUT .= '{acl, smeusers, {user_regexp,"'; - $OUT .= $users; - $OUT .= '"}}.'; - $OUT .= "\n"; - } - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/20PubSubNodes smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/20PubSubNodes --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/20PubSubNodes 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/20PubSubNodes 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -{ - $OUT =<<'HERE'; -% Everybody can create pubsub nodes -{access, pubsub_createnode, [{allow, all}]}. -HERE -} - diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/25ConfigurationAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/25ConfigurationAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/25ConfigurationAccess 2007-09-20 16:12:29.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/25ConfigurationAccess 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT =<<'HERE'; -% Only admins can use configuration interface: -{access, configure, [{allow, admin}]}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/30InBandRegistration smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/30InBandRegistration --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/30InBandRegistration 2007-09-28 11:04:50.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/30InBandRegistration 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -{ - $OUT =<<'HERE'; -% 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 -HERE - $OUT .= '{access, register, [{'; - my $perm = 'deny,all'; - $perm = 'allow,all' if ( ${ejabberd}{Register} eq 'all' ); - $perm = 'allow,smeusers' if ( ${ejabberd}{Register} eq 'smeusers' ); - $OUT .= $perm; - $OUT .= '}]}.'; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/35WelcomeMsg smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/35WelcomeMsg --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/35WelcomeMsg 2007-09-26 06:38:00.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/35WelcomeMsg 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -{ - $OUT =<<'HERE'; -% After successful registration user will get message with following subject -% and body: -%{welcome_message, -% {"Welcome!", -% "Welcome to Instant Messaging server localhost. " -% "For information about ejabberd visit http://www.process-one.net/"}}. -% Replace them with 'none' if you don't want to send such message: -HERE - $OUT .= '{welcome_message, '; - $OUT .= "\n"; - if ( (defined ${ejabberd}{WelcomeSubject}) && ( ${ejabberd}{WelcomeSubject} ne '') ){ - $OUT .= ('{"'.${ejabberd}{WelcomeSubject}.'",'); - foreach $line ( split /\n/, ${ejabberd}{WelcomeText} ) { - $OUT .= ('"'.$line.'"'); - $OUT .= "\n"; - } - $OUT .= '}'; - } - else { - $OUT .= 'none'; - } - $OUT .= '}.'; - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/40RegisterNotify smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/40RegisterNotify --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/40RegisterNotify 2007-09-25 03:16:20.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/40RegisterNotify 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -{ - $OUT =<<'HERE'; -% List of people who will get notifications about registered users -%{registration_watchers, ["admin1@test.leclere.homeip.com", -% "admin2@test.leclere.homeip.com"]}. -HERE - if ( ${ejabberd}{Notify} eq 'enabled' ) { - $OUT .= '{registration_watchers, ["admin@'; - $OUT .= ${DomainName}; - $OUT .= ']}'; - } - $OUT .= "\n"; -} - diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/42Announcement smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/42Announcement --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/42Announcement 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/42Announcement 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT =<<'HERE'; -% Only admins can send announcement messages : -{access, announce, [{allow, admin}]}. -HERE -} \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/45c2sS2SConf smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/45c2sS2SConf --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/45c2sS2SConf 2007-09-20 16:12:29.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/45c2sS2SConf 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -{ - $OUT =<<'HERE'; -% Only non-blocked users can use c2s connections: -{access, c2s, [{deny, blocked}, - {allow, all}]}. - -% Set shaper with name "normal" to limit traffic speed to 1000B/s -{shaper, normal, {maxrate, 1000}}. - -% Set shaper with name "fast" to limit traffic speed to 50000B/s -{shaper, fast, {maxrate, 50000}}. - -% For all users except admins used "normal" shaper -{access, c2s_shaper, [{none, admin}, - {normal, all}]}. - -% For all S2S connections used "fast" shaper -{access, s2s_shaper, [{fast, all}]}. - -% Admins of this server are also admins of MUC service: -{access, muc_admin, [{allow, admin}]}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/50MUCAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/50MUCAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/50MUCAccess 2008-05-09 00:28:36.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/50MUCAccess 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -{ - $OUT =<<'HERE'; -% All users are allowed to use MUC service: -{access, muc, [{allow, all}]}. -{access, muc_log, [{allow, admin}, {deny, all}]}. -HERE -} - diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/52AllowAccess smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/52AllowAccess --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/52AllowAccess 2007-09-20 16:12:29.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/52AllowAccess 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT =<<'HERE'; -% Allow access only for local users: -{access, local, [{allow, local}]}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/55AuthConf smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/55AuthConf --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/55AuthConf 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/55AuthConf 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -{ - $OUT =<<'HERE'; -% Authentication method. If you want to use internal user base, then use -% this line: -{auth_method, internal}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/60HostName smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/60HostName --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/60HostName 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/60HostName 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -{ - $OUT =<<'HERE'; -% Host name: -HERE - $OUT .= '{hosts, ["'; - $OUT .= ${ejabberd}{Domain}; - $OUT .= '"]}.'; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/65MaxUserSessions smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/65MaxUserSessions --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/65MaxUserSessions 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/65MaxUserSessions 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT =<<'HERE'; -%% Define the maximum number of time a single user is allowed to connect: -{max_user_sessions, 10}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/70AnonymousLogin smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/70AnonymousLogin --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/70AnonymousLogin 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/70AnonymousLogin 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -{ - $OUT =<<'HERE'; -%% Anonymous login support: -%% auth_method: anonymous -%% anonymous_protocol: sasl_anon|login_anon|both -%% allow_multiple_connections: true|false -%%{host_config, "public.example.org", [{auth_method, anonymous}, -%% {allow_multiple_connections, false}, -%% {anonymous_protocol, sasl_anon}]}. -%% To use both anonymous and internal authentication: -%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/75DefaultLanguage smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/75DefaultLanguage --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/75DefaultLanguage 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/75DefaultLanguage 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -{ - $OUT =<<'HERE'; -% Default language for server messages -HERE - $OUT .= '{language, "'; - $OUT .= substr(${sysconfig}{Language}, 0, 2); - $OUT .= '"}.'; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports00Start smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports00Start --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports00Start 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports00Start 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -{ - $OUT .= "% Listened ports:\n"; - $OUT .= "\{listen, ["; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports10c2s smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports10c2s --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports10c2s 2008-05-06 21:53:51.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports10c2s 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -{ - $OUT =<<'HERE'; - %%{5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, - %% Use this line to enable SSL: - %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, - %% - %% Use those lines instead for TLS support: - %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, - %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, - -HERE - if ( ${ejabberd}{XMPPAccess} eq 'tls' ) { - $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/opt/ejabberd/conf/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]},'; - $OUT .= "\n"; - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]}'; - $OUT .= "\n\n"; - } - else { - $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]},'; - $OUT .= "\n"; - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]}'; - $OUT .= "\n\n"; - } -} \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports20s2S smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports20s2S --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports20s2S 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports20s2S 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT .=' %% Remove this line if you want to prevent s2s connections:'; - $OUT .= "\n"; - $OUT .= ' ,{5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}'; - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports30http smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports30http --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports30http 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports30http 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -{ - $OUT .= ' %% remove http_poll to remove support for http polling'; - $OUT .= "\n"; - $OUT .= ' %% remove web_admin to disable admin interface:'; - $OUT .= "\n"; - $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}, http_poll'; - $OUT .= ', web_admin' if (${ejabberd}{WebAdmin} eq 'enabled'); - $OUT .= ']}'; - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports40ExternalExample smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports40ExternalExample --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports40ExternalExample 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports40ExternalExample 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -{ - $OUT .= ' %% This is an example on how to define an external service/transport:'; - $OUT .= "\n"; - $OUT .= ' %%,{8888, ejabberd_service, [{access, all},'; - $OUT .= "\n"; - $OUT .= ' %% {hosts, ["icq.test.leclere.homeip.com", "sms.test.leclere.homeip.com"],'; - $OUT .= "\n"; - $OUT .= ' %% [{password, "secret"}]}]}'; - $OUT .= "\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports99End smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports99End --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports99End 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/80Ports99End 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -{ - $OUT .= " ]\}."; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/83PortsOut smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/83PortsOut --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/83PortsOut 2008-05-06 10:23:43.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/83PortsOut 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - $OUT .= '% If SRV lookup fails, then port 5269 is used to communicate with remote server'; - $OUT .= "\n"; - $OUT .= '{outgoing_s2s_port, 5269}.'; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/85Modules smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/85Modules --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/85Modules 2008-05-09 00:38:26.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/85Modules 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -{ - $OUT =<<'HERE'; -% Used modules: -{modules, - [ - {mod_register, [{access, register}]}, - {mod_roster, []}, - {mod_privacy, []}, - {mod_adhoc, []}, - {mod_configure, []}, % Depends on mod_adhoc - {mod_configure2, []}, - {mod_disco, []}, - {mod_stats, []}, - {mod_vcard, []}, - {mod_caps, []}, - {mod_offline, []}, - {mod_announce, [{access, announce}]}, % Depends on mod_adhoc - {mod_private, []}, - {mod_irc, []}, -% Default options for mod_muc: -% host: "conference." ++ ?MYNAME -% access: all -% access_create: all -% access_admin: none (only room creator has owner privileges) - {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, - {mod_muc_log, []}, - {mod_shared_roster, []}, - {mod_pubsub, [{access_createnode, pubsub_createnode}]}, - {mod_time, []}, - {mod_last, []}, -% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, - {mod_version, []}, - {mod_ctlextra, []}, -HERE - $OUT .= ' {mod_echo, [{host, "echo.'; - $OUT .= ${DomainName}; - $OUT .= '"}]}'; - $OUT .= "\n"; - $OUT .= ' ]}.'; - $OUT .= "\n\n"; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-begin smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-begin --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-begin 2007-09-29 07:39:44.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-begin 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -{ - $OUT =<<'HERE'; -% $Id: $ - -override_acls. -override_global. -override_local. -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-end smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-end --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-end 2007-09-20 16:12:30.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ejabberd.cfg/template-end 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -{ - $OUT =<<'HERE'; -% Local Variables: -% mode: erlang -% End: -HERE -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/20key smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/20key --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/20key 2005-11-21 00:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/20key 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -{ - my $domain = $DomainName || "localdomain"; - my $hostname = $SystemName || "localhost"; - $OUT = ''; - - my $key = $modSSL{'key'}; - unless ($key) - { - $key = "/home/e-smith/ssl.key/$hostname.$domain.key"; - use esmith::templates; - esmith::templates::processTemplate({ - TEMPLATE_PATH => "/home/e-smith/ssl.key/key", - OUTPUT_FILENAME => $key, - }); - } - open(KEY, $key) or die "Could not open key file: $!"; - my @key = ; - chomp @key; - $OUT = join "\n", @key; - close KEY; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/40crt smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/40crt --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/40crt 2005-11-21 00:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/opt/ejabberd/conf/ssl.pem/40crt 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -{ - my $domain = $DomainName || "localdomain"; - my $hostname = $SystemName || "localhost"; - - my $crt = $modSSL{'crt'}; - unless ($crt) - { - $crt = "/home/e-smith/ssl.crt/$hostname.$domain.crt"; - use esmith::templates; - esmith::templates::processTemplate({ - TEMPLATE_PATH => "/home/e-smith/ssl.crt/crt", - OUTPUT_FILENAME => $crt, - }); - } - open(CRT, $crt) or die "Could not open crt file: $!"; - my @crt = ; - chomp @crt; - $OUT = join "\n", @crt; - close CRT; -} diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg 2008-05-15 12:53:52.000000000 +0200 @@ -0,0 +1,3 @@ +PERMS=0640 +UID="ejabberd" +GID="ejabberd" diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/e-smith/mnesia/init/00_restore_dumped_dbs smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/e-smith/mnesia/init/00_restore_dumped_dbs --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/e-smith/mnesia/init/00_restore_dumped_dbs 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/e-smith/mnesia/init/00_restore_dumped_dbs 2006-03-16 07:44:28.000000000 +0100 @@ -0,0 +1 @@ +PERMS=0540 diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/rc.d/rc.local smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/rc.d/rc.local --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/rc.d/rc.local 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/rc.d/rc.local 2008-05-19 03:24:08.000000000 +0200 @@ -0,0 +1 @@ +PERMS=0755 \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ejabberd.cfg smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ejabberd.cfg --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ejabberd.cfg 2007-09-14 23:51:08.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ejabberd.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -PERMS=0640 -UID="root" -GID="ejabberd" diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ssl.pem/pem smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ssl.pem/pem --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ssl.pem/pem 2007-09-27 08:37:00.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/opt/ejabberd/conf/ssl.pem/pem 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -TEMPLATE_PATH="/opt/ejabberd/conf/ssl.pem" -OUTPUT_FILENAME=use esmith::ConfigDB; my $c = esmith::ConfigDB->open_ro; my $s = $c->get('SystemName')->value; my $d = $c->get('DomainName')->value; "/opt/ejabberd/conf/ssl.pem/$s.$d.pem" -UID="ejabberd" -GID="root" -PERMS=0460 \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/etc/rc.d/init.d/ejabberd.init smeserver-ejabberd-2.0.0-2/root/etc/rc.d/init.d/ejabberd.init --- smeserver-ejabberd-2.0.0-1/root/etc/rc.d/init.d/ejabberd.init 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/etc/rc.d/init.d/ejabberd.init 2008-05-20 02:18:00.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/sh +# + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ $# -lt 1 ]; then + echo "Usage: $0 " 1>&2 + exit 1 +fi +# We should only do something if $1 is 'start'. +if [ $1 != "start" ] && [ $1 != "restart" ]; then + exit 0 +fi + + sv check /service/ejabberd | grep -q 'ok: run:' + if [ $? -eq 0 ] + then + exit_value=0 + HOME=/root + export HOME + for link in $(find /etc/e-smith/mnesia/init -type f -o -type l | sort) + do + F=$(basename $link | sed s/S[0-9][0-9]//) + case $F in + *) + action "Executing mnesia update $F " $link && /bin/rm $link + ;; + esac + # Record any failure for the final return value. + if [ $? -ne 0 ]; then + exit_value=1 + fi + done + exit $exit_value + fi diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/bin/preuninstall.sh smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/bin/preuninstall.sh --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/bin/preuninstall.sh 2008-05-11 22:22:00.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/bin/preuninstall.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -#!/bin/sh - -echo -echo " -=- SME Server ejabberd pre uninstallation script -=- " -echo " (c) 2008 Free-EOS " -echo -echo "* Stopping ejabberd instance" -/sbin/e-smith/ejabberdctl stop -echo -echo "* Stopping Erlang Portmapper Deamon" -/usr/lib/erlang/bin/epmd -kill -cd /service/ejabberd -rm /service/ejabberd -svc -dx . log -echo -echo "==> Pre uninstallation tasks finished" diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberd.cfg smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberd.cfg --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberd.cfg 2008-04-27 22:55:03.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberd.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,174 +0,0 @@ -% $Id: $ - -%override_acls. - -% Users that have admin access. Add line like one of the following after you -% will be successfully registered on server to get admin access: -{acl, admin, {user, "admin"}}. - -% Blocked users: -%{acl, blocked, {user, "test"}}. - -% Local users: -{acl, local, {user_regexp, ""}}. - -% Another examples of ACLs: -%{acl, jabberorg, {server, "jabber.org"}}. -%{acl, aleksey, {user, "aleksey", "jabber.ru"}}. -%{acl, test, {user_regexp, "^test"}}. -%{acl, test, {user_glob, "test*"}}. - -% Everybody can create pubsub nodes -{access, pubsub_createnode, [{allow, all}]}. - -% 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}]}. - -% After successful registration user will get message with following subject -% and body: -%{welcome_message, -% {"Welcome!", -% "Welcome to Instant Messaging server localhost. " -% "For information about ejabberd visit http://www.process-one.net/"}}. -% Replace them with 'none' if you don't want to send such message: -{welcome_message, none}. - -% List of people who will get notifications about registered users -%{registration_watchers, ["admin1@localhost.localdomain", -% "admin2@localhost.localdomain"]}. - -% Only admins can send announcement messages: -{access, announce, [{allow, admin}]}. - -% Only non-blocked users can use c2s connections: -{access, c2s, [{deny, blocked}, - {allow, all}]}. - -% Set shaper with name "normal" to limit traffic speed to 1000B/s -{shaper, normal, {maxrate, 1000}}. - -% Set shaper with name "fast" to limit traffic speed to 50000B/s -{shaper, fast, {maxrate, 50000}}. - -% For all users except admins used "normal" shaper -{access, c2s_shaper, [{none, admin}, - {normal, all}]}. - -% For all S2S connections used "fast" shaper -{access, s2s_shaper, [{fast, all}]}. - -% Admins of this server are also admins of MUC service: -{access, muc_admin, [{allow, admin}]}. - -% All users are allowed to use MUC service: -{access, muc, [{allow, all}]}. - -% This rule allows access only for local users: -{access, local, [{allow, local}]}. - - -% Authentication method. If you want to use internal user base, then use -% this line: -{auth_method, internal}. - -% For LDAP authentication use these lines instead of above one: -%{auth_method, ldap}. -%{ldap_servers, ["localhost.localdomain"]}. % List of LDAP servers -%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID -%{ldap_base, "dc=example,dc=com"}. % Search base of LDAP directory -%{ldap_rootdn, "dc=example,dc=com"}. % LDAP manager -%{ldap_password, "******"}. % Password to LDAP manager - -% For authentication via external script use the following: -%{auth_method, external}. -%{extauth_program, "/path/to/authentication/script"}. - -% For authentication via ODBC use the following: -%{auth_method, odbc}. -%{odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}. - -% Host name: -{hosts, ["localhost.localdomain"]}. - -%% Define the maximum number of time a single user is allowed to connect: -{max_user_sessions, 10}. - -%% Anonymous login support: -%% auth_method: anonymous -%% anonymous_protocol: sasl_anon|login_anon|both -%% allow_multiple_connections: true|false -%%{host_config, "public.example.org", [{auth_method, anonymous}, -%% {allow_multiple_connections, false}, -%% {anonymous_protocol, sasl_anon}]}. -%% To use both anonymous and internal authentication: -%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. - -% Default language for server messages -% TODO: Use installer selection -{language, "en"}. - -% Listened ports: -{listen, [ - {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, - %% Use this line to enable SSL: - %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, - %% - %% Use those lines instead for TLS support: - %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, - %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, - - %% Remove this line if you want to prevent s2s connections: - {5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}, - - %% remove http_poll to remove support for http polling - %% remove web_admin to disable admin interface: - {5280, ejabberd_http, [http_poll, web_admin]} - %% This is an example on how to define an external service/transport: - %%{8888, ejabberd_service, [{access, all}, - %% {hosts, ["icq.localhost.localdomain", "sms.localhost.localdomain"], - %% [{password, "secret"}]}]} - ]}. - -% If SRV lookup fails, then port 5269 is used to communicate with remote server -{outgoing_s2s_port, 5269}. - -% Used modules: -{modules, - [ - {mod_register, [{access, register}]}, - {mod_roster, []}, - {mod_privacy, []}, - {mod_adhoc, []}, - {mod_configure, []}, % Depends on mod_adhoc - {mod_configure2, []}, - {mod_disco, []}, - {mod_stats, []}, - {mod_vcard, []}, - {mod_offline, []}, - {mod_announce, [{access, announce}]}, % Depends on mod_adhoc - {mod_echo, [{host, "echo.localhost.localdomain"}]}, - {mod_private, []}, - {mod_irc, []}, -% Default options for mod_muc: -% host: "conference." ++ ?MYNAME -% access: all -% access_create: all -% access_admin: none (only room creator has owner privileges) - {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, -% {mod_muc_log, []}, -% {mod_shared_roster, []}, - {mod_pubsub, [{access_createnode, pubsub_createnode}]}, - {mod_time, []}, - {mod_last, []}, -% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, - {mod_version, []} - ]}. - -% Local Variables: -% mode: erlang -% End: diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberdctl.cfg smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberdctl.cfg --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberdctl.cfg 2008-05-11 21:59:00.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberdctl.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,75 +0,0 @@ -# -# In this file you can configure options that are passed by ejabberdctl -# to the erlang runtime system when starting ejabberd -# - -# POLL: Kernel polling ([true|false]) -# -# The kernel polling option requires support in the kernel. -# Additionaly, you need to enable this feature while compiling Erlang. -# -# Default: true -# -POLL=true - -# SMP: SMP support ([enable|auto|disable]) -# -# Explanation in Erlang/OTP documentation: -# enable: starts the Erlang runtime system with SMP support enabled. -# This may fail if no runtime system with SMP support is available. -# auto: starts the Erlang runtime system with SMP support enabled if it -# is available and more than one logical processor are detected. -# disable: starts a runtime system without SMP support. -# -# Default: auto -# -SMP=auto - -# ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports -# -# ejabberd consumes two or three ports for every connection, either -# from a client or from another Jabber server. So take this into -# account when setting this limit. -# -# Default: 32000 -# Maximum: 268435456 -# -ERL_MAX_PORTS=32000 - -# PROCESSES: Maximum number of Erlang processes -# -# Erlang consumes a lot of lightweight processes. If there is a lot of activity -# on ejabberd so that the maximum number of proccesses is reached, people will -# experiment greater latency times. As these processes are implemented in -# Erlang, and therefore not related to the operating system processes, you do -# not have to worry about allowing a huge number of them. -# -# Default: 250000 -# Maximum: 268435456 -# -ERL_PROCESSES=250000 - -# ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables -# -# The number of concurrent ETS and Mnesia tables is limited. When the limit is -# reached, errors will appear in the logs: -# ** Too many db tables ** -# You can safely increase this limit when starting ejabberd. It impacts memory -# consumption but the difference will be quite small. -# -# Default: 1400 -# -ERL_MAX_ETS_TABLES=1400 - -# The next variable allows to explicitly specify erlang node for ejabberd -# It can be given in different formats: -# ERLANG_NODE=ejabberd -# Lets erlang add hostname to the node (ejabberd uses short name in this case) -# ERLANG_NODE=ejabberd@hostname -# Erlang uses node name as is (so make sure that hostname is a real -# machine hostname or you'll not be able to control ejabberd) -# ERLANG_NODE=ejabberd@hostname.domainname -# The same as previous, but erlang will use long hostname -# (see erl (1) manual for details) -# -ERLANG_NODE=ejabberd diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/inetrc smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/inetrc --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/inetrc 2008-05-06 20:18:11.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/inetrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -{lookup,["file","native"]}. -{host,{127,0,0,1}, ["localhost","localhost"]}. -{file, resolv, "/etc/resolv.conf"}. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/server.pem smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/server.pem --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/server.pem 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/server.pem 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDvDCCAyWgAwIBAgIJAOBE76dYOsdsMA0GCSqGSIb3DQEBBAUAMIGbMQswCQYD -VQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQYXJpczEXMBUGA1UEChMO -VGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mtb25lMRcwFQYDVQQDEw5N -aWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29udGFjdEBwcm9jZXNzLW9u -ZS5uZXQwHhcNMDYwMzAzMTYwNjQ2WhcNMTYwMjI5MTYwNjQ2WjCBmzELMAkGA1UE -BhMCRlIxDDAKBgNVBAgTA0lERjEOMAwGA1UEBxMFUGFyaXMxFzAVBgNVBAoTDlRl -c3QgU2VydmVyIFAxMRQwEgYDVQQLEwtQcm9jZXNzLW9uZTEXMBUGA1UEAxMOTWlj -a2FlbCBSZW1vbmQxJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RAcHJvY2Vzcy1vbmUu -bmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8sZ/Wb2GqYPL43OBzBNz0 -gFT1iDZMLLgpMYqBZElKul7GGCdLZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay -4+Ef7Y6zdjXAsYGtYhdmms6icCk1RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4 -276RcZSukN2AR4/pziWysQIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFMBW8llnB7AA -hu9u+ivBndDdbmLTMIHQBgNVHSMEgcgwgcWAFMBW8llnB7AAhu9u+ivBndDdbmLT -oYGhpIGeMIGbMQswCQYDVQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQ -YXJpczEXMBUGA1UEChMOVGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mt -b25lMRcwFQYDVQQDEw5NaWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29u -dGFjdEBwcm9jZXNzLW9uZS5uZXSCCQDgRO+nWDrHbDAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBBAUAA4GBAGtYeVL7BlksuXf79V/WfBPosKD4yVzs7P9GsgS/D10T -HMIRbjIOma4IVy8Es/UBJ0Q4gPojVg4lPo3xv/PSgSDJfbcJyWjSbAh0eGvHtNc5 -4GnYVx5ox0o0MBR8Mt0ChbwA5QMSo6bqc5tRK6+B+ib4ELix7MCSq3wdh7HcuL9D ------END CERTIFICATE----- ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC8sZ/Wb2GqYPL43OBzBNz0gFT1iDZMLLgpMYqBZElKul7GGCdL -ZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay4+Ef7Y6zdjXAsYGtYhdmms6icCk1 -RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4276RcZSukN2AR4/pziWysQIDAQAB -AoGADl1DOrK975dzx6gg2gCrxV0jmpFk+MWKu3APCCyXO74WSuQ50Y5v25Dogwxc -qFYgW1qLvNBHhkpyJg0Up6kkGUalWNgdX/D63QMA/HeSLIpuUsoTGt/F3yu5wcaJ -8y+WVZ5fcNK+rSYyNdnxv0+euazr2HUpfe5zqscGMdT5kDECQQDop9vLcop4aPkd -h5e/AJt6irb/GQt7MBYZzxI+lof8SoASyL3EcMjZI002JCLXWirOX47eO7G7v/D1 -v7feRz3dAkEAz6CIqd9nHPT1QNmhb6QANC6Cy1PzQdAOjxz+0CRHzPBOy+bnHI00 -921RQdCiJ/KEp4olDrTVOMkjbKa928kM5QJBAJspuBDLZ0Y+3EWxdKbSBN+JO9qO -HXYe795ul8BeLHs6RIhCkS09+vW18Xy2RPZTEFFqsaHNNg/9RvrezgXUhZECQQCp -Tk3Cv9J0cWeALzcOM1ybMIYlSVqmgwMsPkem8L6/5gFLEgnJZXgYf0LweTGRg5ga -inK3cEwilxnU4o8VJvflAkBcd/gsVklKfr0Z+vcfjoXsIAN5DoWQYozo7omUIudS -5wjh6y5uYtkhazIJRxNUi9WMfKqhnrje0NfG+p+Sxs7J ------END RSA PRIVATE KEY----- diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/COPYING smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/COPYING --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/COPYING 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/COPYING 1970-01-01 01:00:00.000000000 +0100 @@ -1,343 +0,0 @@ -As a special exception, the authors give permission to link this program -with the OpenSSL library and distribute the resulting binary. - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/default.css smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/default.css --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/default.css 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/default.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -body { - scrollbar-face-color: #F5F5F5; - scrollbar-highlight-color: #F5F5F5; - scrollbar-3dlight-color: #B9B8C5; - scrollbar-darkshadow-color: #FFFFFF; - scrollbar-shadow-color: #B9B8C5; - scrollbar-arrow-color: #FF3300; - scrollbar-track-color: #FFFFFF; -} -body, table { - font-family: Arial, Helvetica, sans-serif; - background: #FFFFFF; - font-size: 12; - color:#000066; - font-weight: normal; - margin-bottom: 0; - margin-left: 0; - margin-right: 0; - margin-top: 0; -} -hr { - color: #B9B8C5; -} -a { - color:#000066; - text-decoration:underline; - font-weight:bold; -} -a:visited { - color:#000066; - text-decoration:underline; - font-weight:bold; -} -a:active { - color:#000066; - text-decoration:underline; - font-weight:bold; -} -a:hover { - color:#FF3300; - text-decoration:none; - font-weight:bold; -} -span.orange_title { - font-family: Arial, Helvetica, sans-serif; - font-size: 12; - color:#FF3300; - font-weight: bold; - font-style: normal; -} -td.content { - margin-left: 10px; - margin-right: 10px; -} -span.copyright { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10; - color: #A59EC0; - font-weight: normal; - font-style: normal; -} \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/ejabberd_banner.jpg smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/ejabberd_banner.jpg --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/ejabberd_banner.jpg 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/ejabberd_banner.jpg 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -JFIFddDuckyFAdobed -  - - -  - -UX - !1AԕQa"UVqBu62br#3CS$tERsT%cF'4 - -!1QRASaq"2Br34#sbC$ⳃ%5& ?=N/>?<Ȕ^<Dzf}T.g8?t -Q -Q -Q -Q -Qç\8Wcܞ8_csx~ ,rypb9i%F9Y_cd4Fl]%e~ ,G9Tu&8MQ/KQMP-UXHɫ2)˼Vcb=+,WXd"Sj:YWHd"TȵWcB=4ΞB%N Uq~7#HDZΞEK'U[܏Eu~7"Zu,%Vo^_yIG'+!Uv-UP)btrr\7jUizymGK7|>i uCKza9!q!놇ޗ9oyЮiuCK7_4η9-_Ks'Khw8z[/;t+x\|=k8{Ӻ(xKs(kOhzZ/<t+x\;Z;40ꖴgNⷍ.E<=k8{Ӻ(xKs(kOhzZ/<t+x\;Z;40ꖴgNⷍ.E<=k8{Ӻ(xKs(kOhzZ/<t+x\;Z;40ꖴgNⷍ.E<=k8{Ӻ(xKs(kOhzZ/<t+x\;Z;40ꖴgNⷍ.E<=k8{Ӻ(xKs(kOhYX4Έ-x\<=K9EnZN$03dR%nw" oۜpAr 9:D!/܋W ,S2;|Vȹ<=k8{Ӻ(xKs(kOhzZ/<t+x\;Z%YԺwAJOaP73n:(\JNTwS;ʠ#NZA3IwkxҤ4$g0<?1߿^u7½|bRI=9:FׂVdE"&Tq1èHK"eCB,,AezYj Y2WX-D "QY[El"Z.Yf ˑYf"ˑ]gA"2VY2UYeሲ蕜1] WptJ-4[13?hgn01 E"` |2)\,+}.InƵF{b #EU\5i%AGZ=/sd*"k 8)*"RL,HIOÂI"5DJd -"%k,D*-D+=b,(E QX-D -1Z.Ew@.]f Q Yf ˑYf ˑYe+b %w AĬeȬe"ˑYb_Hr+.Eu\gI~ϼ3=6bFs -gƧIV|T(CFRH*xHg0CxӔS"rg|$wO8Nw{"e(5ɴ0O'^o2{!W̅6iQjK5-e%΋^yQ_8x_i{5?n#g@?;ۏ/iV =K+qCc<ɟV3ŢOG b`11T$ڋy&F[żX!1%r?n2JZGq$<1ܡwHׂ>χ=|(%=Ɠ SY[vJYsgnUplʛ3Mqc&IckwPX.s<$vN-V5fܧ7g,ݔqëq?w}*TqgE|^J78`VEXwzoH?R߿sS-2"%DJeFc,z&Q_'߃/9d3#.> z o5Zm*1""Z*꿡Uj .F$`QIX 9?g);YMZ#J VZ31/}D[ɍHRR\82Q$u:qN -:5i,Z+{tJ-]f"ˑYf ˑY/EueȮ QYe15(gn7;ҖLJK5N7R`KIprU7cW5MXiL3SܦY u$#2щb;zU6qmqUiY.,cfVYe讣"ˑ]f ˑYBa{1V>ࢦ#} g=0J69|i?qJV1eu! φL)}il*|x 2Ve8z!|b9IБDdde#`TTֶ B#<n.;;ڬUzmKK8Z%%IQbFFZ mxqI TIDFEN߉ H I('N߿- -RFrRL22i8\}HNQ9{Yz^ے{բ sCm0 2d:{0enJ{dDf5ѣ*͎3)Ǩz]m&|H6L|ULY)֓u1݌fւZ:Ć07)E_͒V*uOX=TSB"Uh֥4ݔˆb+f&z֣Alk2xQ2M9JCrl(jQdH=1}.  FX2qTzDܰZ0sMjO:3>bUT(CJ*l#$kQnn\y\9^DYkŌ}-%M JzdQ ɴNWE6oj\J~D̬͜*R/{~.4P.!,C2d;JWhvP*r~SĪJ -1Yy*_l'ɯ?*e=6I38W -M;1ay'RV8}jIS6Q/nM2iVKjZu+gw{GtFU=-$ҕG—)=W+.M*M=_CtQ]e%=␓V+wc'۝0%G?* ÒtKޒ@Vm.nF+IZ *JDd4˼NK͒9x%%l%%WX4i'dD:el,BiT+"YR)AcÛoVxU\l26sRoR)RE1RRqxjT(JK;5eRR5g)buSSxw],eCDRS5wxj**걮Gr4Kޠ鹼c<%rM]2g-TzRZd̾"ZhR_G%W%ӟ:G1-P.b`DDi4ɟ`#qtWdˁ2o0х?%לs'YgթO3M:eXy%$1,}64*& -m5r4>jV2*M 5)+7'XZ?l5W[ͯ)J|1/\1m+{¶TcV$dֵjƣ[fW&c ‹"NSKffi23Qۆ::uZц6Rk|ʗQ%/[ȑ]6lMIH^piIæRR=NJuKW^.QR)-ܰ>vjc0m b1n;rT9Ws"!6Ku -kyI#Sk:̌mѺkCԓ͓2R;}k VBK'ΊW -ÃlX/͐7*=mZeBy YGVYgE"@.EubeEdd)A4aFcd\#Qm3E7a;rWue/gvɝO"j)e%L_')92a" RҴS ﵺE*C(EDP$+?,~ N| ,39ܦ);]ZQOAn7o9R]Lt3mW ̀?;ۏ/iV =K+qCc< JclID[}!;4pG &3כ%kٷDu0V:ZqYyRD,4 =H%bx~/q6^\3JvّD-)ys -dX^-Hv;k^E;'6}a+uk۹3zLzePtݦTf@%%o&;-&FI7{0#4&1ݮQe*VͷV=cMǑv}S'DI!Nr%%k"qg'|7FK||3xo2x_z/؎aFfͶPj&% 8XBJJՈ"AB<_wzu}Q.5w&K&Lrj{k&Z#q)4h:RVϡGтlzn),&>kMz;K*- ,R122ZE:%. - pYn4vA%RHIwU''OHꚃ}`aMn2) %0=I:S:Kbgڅ9b,^m}4L٬Ҩ{qH-)fDmG4m%G-;hέ5$I;[1ov ZZ ֶՑ~l7*{KWil׉Yg@zYr+b],% ގׁcr_cOUQA^?Q9[8#dDUc,lEӕ\ Vi}F}eFjqf^;zoF9c.q8YQ{!U#l2F8$(hi/tQ3{WwMχ^߿9{VW/|AyC3K-OXM散 v(zGů+[I(fVѲ/+UJSLz6h{unqiA6IKx: V:.p):mJǏvXp#3 -x$3\.pʔg|' CFV$FxbF<vƸT"y%37+5s!gJ$.TMpgItoIqZIA1_W+VJ^+EZ"Z}3eDi#YDh #̱bQu!%b~KMaf\]2l90e0^iYܘbXn-;Kfrf]D^_5b> -F@apK yMcô,Oio.5J_FMr믲c{ՆN9LC8M2 '5'! P?JˍZg}&3y`~-!@dIIK%I<0.PV4TFYw&ҥț VT ղ(Q⥔)MLh_.I*K8_V>37V."8[x=KgboZZ{K,DV<4F.5lX'6L^rjݠġ&؏Mݼ)S nDd 2iP1ǒucRpWRmK".,RZT"]F"ˑZ"Q]f Z="ˑ]B b%eȬVpYtJ21蕖z A"AX.Eg AĬ׬A"I2VYeȮb Y|b -&%fԪ-H"{}ў1Ν6&; Xl/Ja)Ji(nRKpū!6]5)18i=dz'Obj+ES3{WwMχ^߿9{V/ʎ 7T{iqF2@ "5Dj&8 -"%k,D -,D+eB (D(@Z1WsP.]b "QYf ]e+,Yr+zDtJ] ˑYb @zDr+Y"A"r+2WY2coAE1Ij)=)/xξAE؍fޖNN.+xu5OmcAXr %e:D&DvRn)4qN&l#IVY&Wߏ 1w ĺfى fCݴoBS9q^+>s2{W6aP6o + _/_n|+  2h_ ,pI?/&2?k~X%i.0q+Hԇt$ H4$8 /JBn4Gbrȸb6x~^W2kO+T1{ IMB_1k5O+T:0{uǣ-t|_)ta -ER-SbB`qzqMzh%ZzІASezhN ywd -o㦩;4Um)!.쮨YZOͥZhN]~6uc]Zk.:R[EK+==ODEƆVj~baYhwq=ںRwҖ5ө3.k.Ȭ:76VgK:]Ȭ:76VwWKr9㺧TFfҖ.vG"|wTS R[c].]VoQaCJZltë˹S#yL3hiKUmxutYw#Y;uDo)m )jk.r+7uN0͡-U:]eܔ+0KՒ{hQ`2ϥ-UBu7OrUA+e+4TǵUPn}jL ]3Ȭ:7ٴ4z]e܎Ef4K:]Ȭ:76VwWKr9㺧TFfҖ.vG"|wTS R[c].]VoQaCJZltë˹S#yL3hiKUmxutYw#Y;uDo)m )jk.r+7uN0͡-U:]e܎Ef4K:]Ȭ:76VwWKr9㺧TFfҖ.vG"|wTS R[c].]VoQaCJZltë˹S#yL3hiKUmxutYw#Y;uDo)m )jk.r+7uN0͡-U:]e܎Ef4K:]Ȭ:76VwWKr|8vfV꛸?ufҖ.vMjzdռ{,R-?KJZl*ǢJk>ٹ㺧TF՛CJZlk.r+7uN0͡-U:]e܎Ef4K:]Ȭ:76VwWKrsj%rk#.+k2)U|nᔵV]JݧI?M/i\u+]Q)0C{N 5}4>w~3_._[_MCO \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/icon_p1.ico smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/icon_p1.ico --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/icon_p1.ico 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/icon_p1.ico 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -00 %(0`     -  - - #')*,./000000000000000000001356786- $2;>@ABCDDDDDDDDDDDDDDDDDDDDDEGHII A3"(F&; (G++++)0  C _V \ ] ] ] ] ] J  WD5!(G'[  ++++)0 (%/ &Z ] ] ] ] ] ] ] ] ] [ = B/ (H)  ++++)0J *\ G n893.+Z ] ] ] ] ] ] ] ] ] ] ] ] ? 7'J)" ++++)0 R ] E HFC@=> jS [ ] ] ] ] ] ] ] ] ] [ 8'K)) ++++)0 ,, T] [ N V N G 0 nHA5S ] ] ] ] ] ] ] ] ] @ e(j( &`++++)0(N [ ] ] ] ] ] ] ] V 8 zD4K g] ] ] ] ] ] ] ] D ] -))"$U -++++)0 -- )Y ] ] ] ] ] ] ] ] ] ] ] C >)V ] ] ] ] ] ] ] > 5 -)*%'݂ ++++)0 W ] ] ] ] ] ] ] ] ] ] ] ] ] : r-, *] ] ] ] ] ] X  )*''*+++)0J *] ] ] ] ] ] ] ] ] ] ] ] ] ] U +[ ] ] ] ] [ )*}E'ܕ$ -*+++)0W E] ] ] ] ] ] ] ] ] ] ] ] ] ] X #] ] ] \ Y e)*!b'ٗ"_ *+++)0X 3] ] ] ] ] ] ] ] ] ] ] ] ] ] Y L )\ \ rZ 2**!d)!a *+++)0] ] ] ] ] ] ] ] ] ] ] ] ] ] T  **&֙+!b -*+++)0\ A] ] ] ] ] ] ] ] ] ] ] ] [  **&֙+zG *+++)0\ A] ] ] ] ] ] ] ] ] ] [ E (i+&֙+. *+++)0\ a] ] ] ] ] ] [ X D'J+&֚+/ *+++)0'K+&՛+0 )+++)0&M+&Ӝ+1 )+++)0&M+'+2 )+++)0)+)+2 )+++)/)+)+3 -)+++).)+)+4 )+++)+)+)+6 )+++)+)+)+FD  )+++%͡0    -                   *+)+k!)+++%ʣ:-%"""""  )+(+k! *+++$ǦG@<;;;;;:97776542222222210/0248)+*+k  *+++'ټywwvvuut=REEDDDB@>====>>?>=;<?CF(+++ h -(H+++++++++++++++++++++++++++++++++++++++!`)E++++++++++++++++++*********))'ۖ'ۖ)+++++++*B+++++++++++++++++++++++++++++++++++++++)+++++++*++++++++++++++++++++++++++++++*Tx8EIk -P Т4K@\!BB*xi@R:ȜUJ[E 06*7eVR_~07%ħg0 {DUY[ :ʼEWn! O靿paK~ۉ^?DA(x@@2͍V pn2e}Zr2[3AL#)q pWOd-C-yzjU{DD=6T@0w$o8xCpxcMLx\5\gᣩ;p:4)j!JQ2p<$B h!ƥޛ愰9;4r1xLnՔf4 ͜^HE?*.?&<Ԓu -ZQVm"o$4י\5lgeI<ϒRgPpw䅝~u F}‡db -w`u鑵_cYҋXG7id$yN!E~T/5:HZ=ԖMdD'KGrgA#x\ï| @LU&&H6v%:~.5\:5/#;•O0IENDB` \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/p1_ejabberd.png smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/p1_ejabberd.png --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/p1_ejabberd.png 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/p1_ejabberd.png 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -PNG - - IHDR>_F9[IgAMA7tEXtSoftwareAdobe ImageReadyqe<PLTEun꣝yrlcD9{}٤铇뻴賫[Frk{mA5{K4D*ꛐ:.s<0u^HĵSH$glXͣ2%qŕja7zվЎLA.!mV@/#k{vR:zrzh"eH=~ҟ]R'ge\]T⭥taW!eNBC8zɁz~oE:{rg^K?_V\Th_,kdZ`JPDT>ӊU?S>XBOD|s^T։T?_JxK@]GG<}aXͲ5)pph~vh`s[R|^JЪܧVLXN~x៖|aWÿ|tF;yystd{s ]]+2IDATx xs4Px$ '8n/$ I(M.х4cKiOO':M|o5??-m*b-ɫmZg£աot5>wY&P2;u\$H,eDo!FJXK<oMʥ >G{U -GʰDȨrRӘȚg6W8|yp|">O';m)E|">oˌwth|OE|ӊD|ķVW ƚ.+w7vq S{yW& 6֪^">^'vjU}ɿJf*-%ЮjɔF|S:= Qk%Ƌ}0&] 6 zwR 3 Q_U0VA+5l|Sz=ƚu5;4>VU7{>hkƷ:iLo h|Ņ|T7Xد`x9R^]ϋ_sZ$e||TBe|eV&UK]AUJ6u|UAS>BGic]./G<|BIK?&h-t*Tptr{ A7:(5+(R#[w/ewU!5PO~[Z6\N-rji?ʁ3Lea1Qcт5Ϫ*){߿UL -|eT7=w-y||xv#  34}1Kn\+g93X?;uu;Z h 8ڥrE=kLGozo&20ڻy--EQ;vU* f)C{{o1DQM+nfǠG|<Ueu3ql=P?.0eLIdW`o<)@ y.T u˕ȵہw xj‡.H "-'8~6Coiy|]L=O`[Zid9Cc/Tgsm~>nLBSآPA=oxhf<榻ß=~ji5FJ\:' -%4BFL.56W Iw2iz'"^ZM|qIDr:uw4.a^|Wk8z 'c>yf5?=;2< -`6I7)ӑ4.|_4|ko~2{ch!>8RXTn" wBvnLGSo81X*cǚͯ=1`:84Xk÷ƧթwhYNުzR뼼-zF`*"¼wOEQNJ.8&;h - >>zJ˗ VnF~k$#h{Pq_T07Ȁz ,5rbJ5&?; )W[% 4LsO2 M4zK%a=wm*DV-4oJZGc43T>Q07>s -Դp潷4OzF$IP{E?X~ - {,> $!sPZ^z"zbmq}ȼfB9q4\M>Jj;Z,1D*dtC:A#:k -~ၲp]m Zeɖ I^iIZ7ڸvl$ D݊÷{6ڳJ`\ Of}b*OKau\;A$žtN|pJbb(R(BMb>dw-Le]ccj")-h&Hs<72 =lDq_V1f?v&ݽ'fbKBB׍opvgBA|2u;S ؆ƋWi=Ufߎ`ޥS&m4}3 lG.bGadTP[0V肏E{^79 [R0N)fmF@߼},N(=(Ci@n\{jao$`fY~} Fk'显B:dHI,L.W2Rw^z']SgUQ&u1C -HVh4&W٥ڛ`AQИRܷM`"ϯ.~cSexJX!#U QxegU\e+)mld4hfR &>އ", kz#e,ce713_ -Ǽ#\U݃WpmFJn:uj؊S JE+ hʻBQ |ѭ>Q$CX>[5˧o*=ZYP -=l.$qURweRJ֯LXA2en +5=tUΕc|U4ҕQ+cA,`7c?f\4״_y=O *V}WJv-/W;ɘCdLg\ʨ9z2횟*ĦJF.&έѡė:4!hHj[OڜҦ-Ço*,0Kj)eP3gӧ$1؄# mW.xzd3+=ΔOG0e lnvz$t9{8\QK^kkk{7z^U{ւߞ&9ֹķvڗܰ ?Ǟu{弞?˿ȳD/ƩOyv/Ɇ~K"mk{>Kw8UmL]E/U8v^\$裇p_r^,Ys==1- %&Η!#k AnL%u2/iN))X UCRaz)a| Lpǚ.Qxz3XqZo!J턃&o҇. *iQi=XjX U=*-rKgg %:,~)+C7mJ,z􇿵7jOD|">Q">O'L/س2`IENDB` \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/p-one_footer.gif smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/p-one_footer.gif --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/p-one_footer.gif 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/p-one_footer.gif 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -GIF89aX 跶!,X  H*\ȰÇ#JHŋ3jȱǏ CLɓ(S˗0cʜI͛8 ٣ϟ@AѣH*]ʴӧP"U@ի -iʵׯ`ÊKٳhӪ]˶W1pʝ+@a*YaRJ+^̸qc"K$C 3kϠ?`@iP~5ky|b˞M 6 4\<NqXN翢Kgvf!hΝ‹C°CO>$`RbRR‚ 6hPN!Bv!h=$h(,0(4h028/ÎC,䓬O"ȕXf%'/0cBi8Ͻ,l'o2 'G q(<0B 3$l$$,ORr*Ǽr,ob7#320H@2<bH]Lׂ("Roc6dtu/`]Fhôݶ"p=s0v{b@@l@88{g)tz)P馗ꬷz; P - p{;/+/o5$+#Wogw/Oom-wo4h)5-{;@@:t Q0'8AKXă7A@GxUtH -Ђ 0̃ eXVc 8a"1hxq"OHD,bAAE*XLOEXd_9A2Q`H`6ajcAGgx# Q3̆ a"iF:[$JZh@&5I t4FIR@VVr j:}̥.w^ 0Ibȴ%Ʌ|p!|f4Lj2 2Q6Ph @F(Qp+Nv;@z3% >OD(=Q@: HB@6D%jڡ (TQ4 F0@R=H'JUJ-TiL@ӚV7= wt@]D@Ԣ -PjX*"Ůvu`Jֲ -EֶnH׺xͫ^XiH `3|Hb:d'KZͬf7X~x g9{Yb̐8\g;I[ @Þ'?wOWjЅ*ԡdhD':^4] `G= -ҏ&EVҗT2MqZ >iPZT"5K%SU8LժYVUub5kYњֶ8p\jW:|-a',X"ΰ7{ ~!f dukv6-n驒z@PeC\Z(GґT)] --yћޠ -u 5+ηo~_W J` +߈>?x|-ЈNa'~IB-JTO&AQ*@6.rPd#WT( B9l)kBf[O^q/Sk4U~UXX[f-qgAқOWֻgO>XC>c -y!7B$wy̛O[Dηo$ BP?z+fO30ȿS6`Zu\bav - ( owqgwhpܐ -XI~wF"8$ t'J6,670284X4xy88zӃ>@B8DXFxHJL؄NH -@TH -aWwk>2w/ٿlc諦pa9֡yk0]sbO- lkkk㎇4'pT@H0~֦ڿZHJ?-*{92jicŭᪧ௬ҷнٽpgmd̰ෳh_!,B( kտ*\ȰÇ#JHŋ3jȱcUt  (S\ɲ˗0-@p`l/}dIѣH^b6*5jթH 8sJÊK,JNxJԷ~KW.P -֬߿)MZmN'P!L*2(R牯)CMHnu82e}c˞OOͻo'Vر״aX9Н7wWAJIBR BB.B؋nvOW-׸ke\sхpʁ%`zufvE@3ThadHlxFaA >SpL'bN(VJq7Y݁.,by&#0d(6$4e٢ 8Ǘ^6! ـ1?(A"0IQ2$?l_(&َ Xs@r%D䣐FIg<YS)1 - y -jHLJz`šp Ē@JD2J5+(2(` -=9J$ώ Έ%>Pa`K -#X33. -LtRi>w7uq?:|%k+TeOx;1*DԂ'o#> ->xP 䡄/G C/-tH%C.M5LЋ".D@TA`aA/ "ў4كXه6/+wF7v|ؔ0*yb`m)QSlXX!b D.dnsB`*B8B &V\J+ A:"03,=0o`  0V/ p"lb]7.C(:[_ܧk~: d ]?@Lq hOM KE ␔\d*")9 0> -@ ān$@A~AiDA -VF"h21fB ౵ -'nD@ZF??曍v -Qn{[7Qo~O@\SaR  $AY, ((PZ dA@pɔQ -bH`U²KDѵ1p0 *bȃnыTB= /R=|1( -^,P9G:r&~x܄٤|J`$@M BRUB("A`[B`B -`z^W1N.,"Ep -A%V+AX!630;lSA$\e!uȸ&b )tC 1x`+\뵢F˰k֗юLOut+B@@ 4{S`Pl{ ׾ C_j!Ta 7`N d1pXpE 00D #/ -`(LE0pm"%C-~1K/|L>-]$l7>^WY?~lm{W1d WIp~\%4 gS]H<L,|*ZQ &R8CL 0! _.ЅZA*p1S lx[Ԏb8ZLל^ec:ՙ]83BY|/5}_yfEcaA SP?ZA$@ZAl@B` C!䝐Qآ xEA3 -@  -t.pV׆3FY\llX@{H[~ǵg#T`V4A )@!6N"maB/h a `;v[>x ʈyws9|`BF! B%"A0,6;ԣ'OU7ҷݭ|_+gy?B0#dJ۽q1Tb\hP_ >60AUHdp:is_Uʆ]7V<]emnEfeVv -H85 @Pp@qp4  -n`W@V4 `Y0WfGlW#mhlqxdE*V_GyH -X p!BR -KP9^Pp֐i&kHxf@pxxN;x/bVpcʇ7v ؇q)pg@i x0I@0 -.u .  1p OHu䈃9'ryXO(D(] . 293Fo 2 @pf-HA9 @ -m#"$#Ax!)e.wOn)هW <0pck n9Ukg p1 -.{1 -`$$5(p8/g|=XG^u_؇R -oә ( - e` b e82|\Ix%y0 `@К|娃 ][my/Qpi |ɑx9t|ɝ r # p v>(G%y -6@ɟA ]$ :y |F(0Zn.5  T0 PtGj -@NN ɠ PVz@ ZJ $^ڥ` -$ bJ/`h -$P/1l/re 6 uzyvʧ :ZzڨwW :ʟ P, 2, ڪ::]p* -gp - Zzw Ҭ  ؚںڭ:Zz -Oک:Zzگ; \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/splash_p1.png smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/splash_p1.png --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/splash_p1.png 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/splash_p1.png 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -PNG - - IHDR:MgAMA7tEXtSoftwareAdobe ImageReadyqe<PLTE0!ٓqwjw+Žyj疊{j;)hVZDYES8tT=㻵壚F3L5|brIuڄxub᫣ڣeT沬nyXGr^`Kÿn㜒ܸnZLo}~y十ڬçwr»ƿڌԙsvޓS?N6/esb?)F0¼թJ4iUE-: _M›q~pwe}ln[ûC&heQɚiV߲dOO9]pĔŰO8~E6}|vɡzo^xE.SKH0"aƿP9ԺqG2O<ü罉xgºﷰx]s|堐p`Բ୰ߍc\eiO7C^9!IDATx \TUM2ȸ$A<ձ XXaxH! -0(B(ڊ(/ 59)>-YڭE+#߹3sy\ץgs9sQG~#ÌN_b#>5a=fa0܄Q'o;1PGgZc/`DC P XXbC  .ȌTסEjz!(Q7GCÏօ>Gb>jKao!K;vPaÉК6AvųVϸ,);0T&$G8H:!JXA9ġCIB{H3Z]&$4Gp@&C Q#3R\hkBZZ([ZFaQxî 0S5Ci20zؔ!} .[%UfdӲGGT<./Tنe`!>: ]SMVxHaAv=8ƾT agHvFav.3#HH\eL5c}`5U;kTWYld1R[E5UV=aa5;V8aTW5$-\XQfH#} -"#e.`U0<$"22M5S2ڵi] -NG" Mұ5U \du&S}=c1IFV4 Nu_&QF -xTyytI>X 2.z 4.tqaQɔFׅ. evzdի3eU8jY+ 2챯:+ cXA,FjyCD-2jY1V$gϚUa#G{ЦYc8Z3QD䰿ȷg2&Z/?#[}@ZW(ԣZD|)ߓ,VR<`<@-c[6Ls1H` =h -<qVVYf(SW&yĕ+WZioQ֬dObķ#D|7+<5⟏o_9`ɣ}ɣZrˇ'W>9`ɣgC~|9' ;kF@>߾pHN(b ˻W7nMpz?/lxSa|v$ʰ Q% p~acgw<)IT(0:xr"S#,<4{<6<ٺ P2('/)bc}7L{ap~3S!Eop{+,xT{#RQgrT8DYgȃ>[wC|Dy5|<]wӋ{t@؋9y]Cqj8ypU"E.(ϢhjJ h|*h}ې*ЪCVRFԈToЉ=0\=TDpD0XsoWp"]wȴG{߮38Z+%Z:/~!G"@;'GtQhj^FS gՕb޻;Ή]);Fvƴ`6=TݳaQ@^]?c62\jn؜@}[Tb@ы+A]?,jg7:gp\"Or9nAn37lNV3f(qB(&*˹JzV{1{!F766QـzpeX fbN@7jyOƷU 7m9U/#ܧa>}y/# 6 fe7Vl,lѯxэ7u*4LM?' Կ/= `Xޡ"\IgLˣ6yWmxBTqdޓ^'iyt<_qQyUxphIA --nՆ^3ȶ8X)= VVJeh Oȃ5|fú}uqbir[J>ujT\dr8:QIq9*Uc=H)L/&k #nȪSg#'2r 7h׆+.Q:tFAdفM[x߸d\$F6bƶ;ylg퍋:>hmǑ5H'M8ko\VXch= (zJ*MHAYI qj(O.xX6m#gMĩ1t)򶢆C@L1Ԍ oH\*T! )FMѸ&[ S &Scplg SZ -djb` -`4u -͠O roوV5@L6**\t#ـNei렅Ǿ"yU3l4ąX#tEdp 2%bbc1f82&v\D2)w)eh+2Y,lq$)I2dɴ"IB;| d$ׁDأ{"yRdS$\c?l28+ 1,Fr[xnATDOhR+7 y $cd~d:DN #v@THHi_IB3jNs%%Q58"/x¡9ʀH!\X!?8?,D099**&f( }=4%[ 7/V:K<$*SL\@tNrO<|+Ï"Q,l=RGk ,L*Azķr'Zp QJܛ6$c5!ڕJ+WFy88QU^߬gb1샑QDj BHatߨ9R/&[rp)2/XYq:6g`#;o^jV򕎕:V XJ{Vs|W͚'D*0I&зS" nBgt'҉4A;!O^LIzu?o86]`U'UaJGfSyt ̓{-߃GGKKƭlO>=mщKTc<:Fl-CQL/0,i3'؄GJGKKM |tj%^,1^K\Hϸ"/tL/*4|#F\x:mݱV]-K*K'2B5ǹ([q~iʸ8%[ 0ݎpETwd4 _2ز.v 4,aϱȖcy\?w\#_*qZwMNxȒ#GA1H_8vܱ,iMpPh7 "cFˈͱP `d%^lz ܻ.wt\rѨu=KST^ ĸX?,6Yo*JiǦ%S??XA~K -Uzcylkk/k\rqtL\\#ի2^6d.^xYB )1H/f%VM.&1vEJ\4x[4_WB?_`Xg+WE,㝲/ ç(A*G+VӺ@au3cE`:P>O{ǕJy&}>F!;qe $E<}_q K -WS%Ƨ|7{|m>ݱ/#ÿJ?A{ܦQ: W(?(c۠?FyeЮ] -ئm{azn,,rlG쿍f|]G "2{<“2Zum۶mW;!o#ŏRB=90m۶ѷX?c=uK`d<]7>Gy0XSda##…?&T,Mzz rNÒ;`4Gc.z:Vea+ - 1d!xłGK\~~B|Ws NV>|[:K,|P})__ b6G4x6{ۭl|oI1xx()0eB2"ٻ͘ (b"@ H {|ef>߯О!-SFk܌a~wWcXe]qHRpeD9U~ZwK X2ݔ.V(IĘ} =ںrͳS`%u|!;"s,K9 9A?Q ]1jǿ|+1^F@o ŊݺL9 -""zty\}ǒttI{4ieq  .Gk|\3fFÎMNApCx5`;Ƭ1+9d3\@t kv䤬s*k_1s9=#f*`\p=Mxk=pMҚX? $c 9Y0xXz41n>/(yk,>hid;f֠G Mڏڔ$;/;er_zs?6sxΦ'Fy"ަ%'SqӪUx >?}[۫r6s"i4/UNz3)#mR'p`ߺLMP~=n B &}ItʌؗCf|NoYu/=#v%T3m}b!h٤U_5AG6`8FȴG!Gbj{< C>o9X1DHS#13ei1+z|sM3~wF`4}Zt=.5_.#j34޸y󫟾:ΙCb 7ɲŘM#o۾OO;0O<&cnD[*PU%:ݻ6~#4޶wSDYw- bD5y߂7oNCdg@e3m4dƷnn7!&#E~.tv򪃲tu&|61y 3I&L-D&--BNZuǧxa93t$cLB'&ٶpti&(+z֪Y5?w&`mɪ5'LƼcf >Dj 8Zf#@m8/p)47&YgiiyCYa:&ǐ1>&<|Ql3Ǎ-gz֒1QOj!1.O(T/]d~-Fa sc2aNTo@wT -s kt߹Y>P}*4|$fke%(=vk 4g%ywL3aRu䟮>]i;a4s@FbTcYg}>6ɎaFh<ޣhۨ40 -m}:uB(ܞe4#1Uۏ5ygr>2˸`m?w޻a!̜1$y4GNɪeGr ,NY7|I=}:=Q|||ܬI&n|]v-!vYaÀXG_LaG{n>aansj2VMx{k<>լ_m)2n]XP:oݭa -j>i]3PCf 0wQ01S q=>8c'q@ϣc G .2kǡ2 -7W_A>b|~a}ΓaC4ol>N+0ѓE^>6 F,`ڃ{x]]!C@۞I5u׻QM -"ҵDP,aY!=IEbndmŲfր,]"lCl0|[X=d@@gt%L>B%"͐n]Di>-,׍Um`6 0L$ZƇ=0#1 ,ܑѨe |CԞ5v=jd%nYɌzzBrsFF)0Kңض؍2VF=?FfxӔg߮ǴIENDB` \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/README.txt smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/README.txt --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/README.txt 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/README.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,208 +0,0 @@ - - Release Notes - ejabberd 2.0.0 - 21 February 2008 - - ejabberd 2.0.0 is a major new version for ejabberd adding plenty of - new features, performance and scalability improvements and - architectural changes. - - ejabberd 2.0.0 includes more than 200 improvements over ejabberd - 1.1.x. A complete list of changes can be retrieved from: - http://redir.process-one.net/ejabberd-2.0.0 - - The new code can be downloaded from ejabberd downloads page: - http://www.process-one.net/en/ejabberd/ - - - Recent changes include: - - -* Clustering and Architecture - -- New front-end and back-end cluster architecture for better - scalability and robustness. Back-end nodes are able to run a fully - fault-tolerant XMPP router and services, but you can now deploy - many front-end nodes to share the load without needing to synchronize - any state with the back-ends. -- All components now run in cluster mode (For example, Multi-User chat - service and file transfer proxy). -- New load balancing algorithm to support Multi-User chat and gateways - clustering. More generally it supports any external component load - balancing. -- ejabberd watchdog to receive warning on suspicious resources consumption. -- Traffic shapers are now supported on components. This protect - ejabberd from components and gateways abuses. - - -* Publish and Subscribe - -- Complete rewrite of the PubSub module. The new PubSub module is - plugin-based, allowing developers to create new nodes type. Any - application can be plugged to ejabberd and can provide rich presence - as a pubsub plugin. -- Personal Eventing via Pubsub support (XEP-0163). This module is - implemented as a PubSub service. It supports user mood (XEP-107), - User Tune (XEP-118), user location (XEP-0080) or user avatar - (XEP-0084) for example. - - -* Server to Server (s2s) - -- More robust code with connection timeout implementation. -- Support for multiple s2s connections per domain. -- s2s whitelist and blacklist support. -- s2s retrial interval. - - -* LDAP - -- Many enterprise-class enhancements such as better behaviour under - heavy load. -- Support for LDAP servers pool. -- Simplified use of virtual hosting with LDAP with domain substitution - in config. -- Ability to match on several userid attributes. - - -* Multi-User Chat - -- Clustering and load balancing support. -- Ability to define default room configuration in ejabberd config file. -- Many anti abuse features have been added: - . New ACL to limit the creation of persistent room to authorized users. - . Ability to define the maximum number of users per room. - . Limitation of the rate of message and presence packets. - . Limitation of the maximum number of room a user can join at the same time. - - -* File Transfer - -- XEP-0065 - Proxy65 file transfer proxy. The proxy can run in - cluster mode. - - -* Authentication - -- PAM (Pluggable Authentication Modules) support on *nix systems. -- External Authentication protocol is now fully documented. - - -* Web Client Support - -- XEP-0124 - BOSH support: BOSH (Bidirectional-streams Over - Synchronous HTTP) was formerly known as "HTTP binding". It provides - an efficient alternative to HTTP polling for scalable Web based chat - solutions. -- HTTP module can now serve static documents (with - mod_http_fileserver). It is needed for high-performance Web 2.0 chat - / IM application. System administrators can now avoid using a proxy - (like Apache) that handles much less simultaneous than ejabberd HTTP - module. -- Added limitations enforcement on HTTP poll and HTTP bind modules - (bandwidth, packet size). - - -* System Administration - -- XEP-0133 - Service administration support. System administrators can - now perform lot of ejabberd related admin tasks from their XMPP - client, through adhoc commands. -- Dynamic log levels: Improved logging with more log levels. You can - now change the loglevel at run time. No performance penalty is - involved when less verbose levels are used. -- The ejabberdctl command-line administration script now can start - and stop ejabberd. It also includes other useful options. - - -* Localization - -- ejabberd is now translated to 24 languages: Catalan, Chinese, Czech, - Dutch, English, Esperanto, French, Galician, German, Italian, Japanese, - Norwegian, Polish, Portuguese, Portuguese (Brazil), Russian, Slovak, - Spanish, Swedish, Thai, Turkish, Ukrainian, Vietnamese, Walloon. - - -* Build and Installer - -- Many launch script improvements. -- New translations. The binary installer is now available in Chinese, - Dutch, English, French, German, Spanish, Russian. -- Makefile now implements uninstall command. -- Full MacOSX compliance in Makefile. -- Configure script is clever at finding libraries in unusual places. - - -* Development API - -- Several hooks have been added for module developers (most notably - presence related hooks). -- HTTP request handler to write HTTP based plugins. -- Manage connections IP address. - - -* Bugfixes - -- ejabberd 2.0.0 also fixes numerous small bugs :) Read the full - changelog for details. - - - - Important Note: - -- Since this release, ejabberd requires Erlang R10B-5 or higher. - R11B-5 is the recommended version. R12 is not yet officially - supported, and is not recommended for production servers. - - - - Upgrading From ejabberd 1.x: - -- If you upgrade from a version older than 1.1.4, please check the - Release Notes of the intermediate versions for additional - information about database or configuration changes. - -- The database schemas didn't change since ejabberd 1.1.4. Of course, - you are encouraged to make a database backup of your SQL database, - or your Mnesia spool directory before upgrading ejabberd. - -- The ejabberdctl command line administration script is improved in - ejabberd 2.0.0, and now it can start and stop ejabberd. If you - already wrote your own start script for ejabberd 1.x, you can - continue using it, or try ejabberdctl. For your convenience, the - ejabberd Guide describes all the ejabberd and Erlang options used by - ejabberdctl. - -- The example ejabberd.cfg file has been reorganized, but its format - and syntax rules are the same. So, you can continue using your - ejabberd.cfg file from 1.x if you want. The most important changes - are described now. - -- The 'ssl' option is no longer available in the listening ports. For - legacy SSL encryption use the option 'tls'. For STARTTLS encryption - as defined in RFC 3920 XMPP-CORE use the option 'starttls'. Check - the ejabberd Guide for more information about configuring listening - ports. - -- The options 'welcome_message' and 'registration_watchers' are now - options of the module mod_register. Check in the ejabberd Guide how - to configure that module. - -- To enable PEP support in mod_pubsub, you need to enable it in the - mod_pubsub configuration, and also enable the new module - mod_caps. Check the section about mod_pubsub in the ejabberd Guide. - -- Other new features and improvements also require changes in the - ejabberd.cfg, like mod_http_bind, mod_http_fileserver, mod_proxy65, - loglevel, pam_service, and watchdog_admins. Search for those words - in the ejabberd Guide and the example ejabberd.cfg. - - - - Bug Reports - - You can officially report bugs on Process-one support site: - https://support.process-one.net/ - - -END \ Pas de fin de ligne à la fin du fichier. diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/ssl.txt smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/ssl.txt --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/ssl.txt 2008-02-21 12:27:18.000000000 +0100 +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/ssl.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Create a SSL key (read this tutorial for more information): - -openssl req -new -x509 -newkey rsa:1024 -days 3650 -keyout privkey.pem -out server.pem -openssl rsa -in privkey.pem -out privkey.pem -cat privkey.pem >> server.pem -rm privkey.pem - -Now edit your ejabberd.cfg file and specify the correct location of your server.pem: - -{listen, [{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, - starttls, {certfile, "/home/ejabberd/server.pem"}]}, - {5223, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, - ssl, {certfile, "/home/ejabberd/server.pem"}]}, diff -BruNa smeserver-ejabberd-2.0.0-1/root/var/service/ejabberd/run smeserver-ejabberd-2.0.0-2/root/var/service/ejabberd/run --- smeserver-ejabberd-2.0.0-1/root/var/service/ejabberd/run 2008-05-13 22:27:29.000000000 +0200 +++ smeserver-ejabberd-2.0.0-2/root/var/service/ejabberd/run 2008-05-22 02:36:01.000000000 +0200 @@ -1,10 +1,19 @@ #!/bin/sh -x -#---------------------------------------------------------------------- -# copyright (C) 2008 Free-EOS Jean-Paul Leclere -#---------------------------------------------------------------------- +#--------------------------------------- +# copyright (C) 2008 Jean-Paul Leclere +#--------------------------------------- exec 2>&1 +if [ ! -f /var/lib/ejabberd/spool/schema.DAT ] +then + if [ -f /home/e-smith/db/ejabberd/ejabberd.backup ] + then + /sbin/e-smith/expand-template /etc/e-smith/mnesia/init/00_restore_dumped_dbs + fi +fi + + NODE=ejabberd HOST=`hostname | cut -d. -f1` VERSION=2.0.0 @@ -20,7 +29,7 @@ # Define ejabberd environment ERL_MAX_PORTS=32000 export ERL_MAX_PORTS -ERL_INETRC_PATH=/opt/ejabberd/conf/inetrc +ERL_INETRC_PATH=/etc/ejabberd/inetrc export ERL_INETRC_PATH SASL_LOG_PATH=/var/log/ejabberd/sasl.log export SASL_LOG_PATH @@ -28,17 +37,15 @@ export EJABBERD_LOG_PATH EJABBERD_SO_PATH=/usr/lib/ejabberd-$VERSION/priv/lib export EJABBERD_SO_PATH -EJABBERD_CONFIG_PATH=/opt/ejabberd/conf/ejabberd.cfg +EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.cfg export EJABBERD_CONFIG_PATH EJABBERD_MSGS_PATH=/usr/lib/ejabberd-$VERSION/priv/msgs export EJABBERD_MSGS_PATH -EJABBERD_DB=/opt/ejabberd/database/ejabberd +EJABBERD_DB=/var/lib/ejabberd/spool export EJABBERD_DB HOME=/var/lib/ejabberd export HOME -[ -d "$EJABBERD_DB" ] || mkdir -p "$EJABBERD_DB" - exec /usr/local/bin/setuidgid ejabberd \ erl -pa /usr/lib/ejabberd-$VERSION/ebin \ -noinput \