Parent Directory | Revision Log | Revision Graph
smeserver-2.0.0-removeOpt.patch correction try again
1 | diff -BruNa smeserver-ejabberd-2.0.0-1/createlinks smeserver-ejabberd-2.0.0-2/createlinks |
2 | --- smeserver-ejabberd-2.0.0-1/createlinks 2008-05-06 10:23:43.000000000 +0200 |
3 | +++ smeserver-ejabberd-2.0.0-2/createlinks 2008-05-18 23:37:19.000000000 +0200 |
4 | @@ -2,7 +2,7 @@ |
5 | |
6 | use esmith::Build::CreateLinks qw(:all); |
7 | |
8 | -templates2events("/opt/ejabberd/conf/ejabberd.cfg", qw( |
9 | +templates2events("/etc/ejabberd/ejabberd.cfg", qw( |
10 | console-save |
11 | bootstrap-console-save |
12 | user-create |
13 | @@ -12,17 +12,12 @@ |
14 | ejabberd-update |
15 | )); |
16 | |
17 | -templates2events("/opt/ejabberd/conf/ssl.pem/pem", qw( |
18 | - console-save |
19 | - bootstrap-console-save |
20 | - ldap-update |
21 | - domain-modify |
22 | - ejabberd-update |
23 | - )); |
24 | - |
25 | # not really good setting of logrotate before starting ejabberd |
26 | -# but works for contrib or core intyegration |
27 | -templates2events("/etc/logrotate.d/proftpd", "ejabberd-update"); |
28 | +# but works for contrib or core integration |
29 | +templates2events("/etc/logrotate.d/ejabberd", "ejabberd-update"); |
30 | + |
31 | +# add ejabberd code to rc.local |
32 | +templates2events("/etc/rc.d/rc.local", "bootstrap-console-save"); |
33 | |
34 | #-------------------------------------------------- |
35 | # pre-backup actions |
36 | @@ -32,21 +27,6 @@ |
37 | event_link("ejabberd-delete-dumped-tables", $event, "11"); |
38 | event_link("ejabberd-dump-tables", $event, "21"); |
39 | |
40 | -#-------------------------------------------------- |
41 | -# post-backup actions |
42 | -#-------------------------------------------------- |
43 | -$event = "post-backup"; |
44 | - |
45 | -# Probably don't really need to do this |
46 | -event_link("ejabberd-delete-dumped-tables", $event, "11"); |
47 | - |
48 | -#-------------------------------------------------- |
49 | -# actions for bootstrap-console-save event |
50 | -#-------------------------------------------------- |
51 | -$event = "bootstrap-console-save"; |
52 | - |
53 | -event_link("ejabberd-load-tables", $event, "41"); |
54 | - |
55 | foreach $event (qw( |
56 | network-create |
57 | network-delete |
58 | @@ -68,6 +48,8 @@ |
59 | service_link_enhanced("ejabberd", "K25", "6"); |
60 | service_link_enhanced("ejabberd", "K25", "1"); |
61 | service_link_enhanced("ejabberd", "K25", "0"); |
62 | +service_link_enhanced("ejabberd.init", "S99", "7"); |
63 | + |
64 | |
65 | templates2events("/etc/rc.d/init.d/masq", "ejabberd-update"); |
66 | safe_symlink("adjust", "root/etc/e-smith/events/ejabberd-update/services2adjust/masq"); |
67 | 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 |
68 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status 1970-01-01 01:00:00.000000000 +0100 |
69 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/status 2008-05-20 02:16:27.000000000 +0200 |
70 | @@ -0,0 +1 @@ |
71 | +enabled |
72 | \ Pas de fin de ligne à la fin du fichier. |
73 | 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 |
74 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type 1970-01-01 01:00:00.000000000 +0100 |
75 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/db/configuration/defaults/ejabberd.init/type 2008-05-20 02:16:18.000000000 +0200 |
76 | @@ -0,0 +1 @@ |
77 | +service |
78 | \ Pas de fin de ligne à la fin du fichier. |
79 | 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 |
80 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-dump-tables 2008-05-08 10:21:04.000000000 +0200 |
81 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-dump-tables 2008-05-18 22:05:34.000000000 +0200 |
82 | @@ -7,4 +7,5 @@ |
83 | exit 0 |
84 | fi |
85 | mkdir -p /home/e-smith/db/ejabberd |
86 | +chown ejabberd.root /home/e-smith/db/ejabberd |
87 | /sbin/e-smith/ejabberdctl backup /home/e-smith/db/ejabberd/ejabberd.backup |
88 | \ Pas de fin de ligne à la fin du fichier. |
89 | 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 |
90 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/events/actions/ejabberd-load-tables 2008-05-08 10:21:36.000000000 +0200 |
91 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/events/actions/ejabberd-load-tables 2008-05-18 22:59:41.000000000 +0200 |
92 | @@ -14,6 +14,5 @@ |
93 | exit 0 |
94 | fi |
95 | /sbin/e-smith/ejabberdctl restore /home/e-smith/db/ejabberd/ejabberd.backup |
96 | - rm -f /home/e-smith/db/ejabberd/ejabberd.backup |
97 | fi |
98 | fi |
99 | \ Pas de fin de ligne à la fin du fichier. |
100 | 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 |
101 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers 1970-01-01 01:00:00.000000000 +0100 |
102 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/10AdminUsers 2007-09-20 16:12:30.000000000 +0200 |
103 | @@ -0,0 +1,8 @@ |
104 | +{ |
105 | + $OUT =<<'HERE'; |
106 | +% Users that have admin access. Add line like one of the following after you |
107 | +% will be successfully registered on server to get admin access: |
108 | +{acl, admin, {user, "admin"}}. |
109 | +HERE |
110 | +} |
111 | + |
112 | 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 |
113 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers 1970-01-01 01:00:00.000000000 +0100 |
114 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/15BlockedUsers 2008-05-06 10:23:43.000000000 +0200 |
115 | @@ -0,0 +1,19 @@ |
116 | +{ |
117 | + $OUT =<<'HERE'; |
118 | +% Blocked users: |
119 | +%{acl, blocked, {user, "test"}}. |
120 | +HERE |
121 | + use esmith::AccountsDB; |
122 | + my $adb = esmith::AccountsDB->open_ro(); |
123 | + my $users; |
124 | + foreach $u ( grep { $_->prop("PasswordSet") ne 'yes' } $adb->users() ) { |
125 | + $users .= ("^". $u->key() .'$|'); |
126 | + } |
127 | + if ($users) { |
128 | + chop $users; |
129 | + $OUT .= ( '{acl, blocked, {user_regexp,"' . $users ); |
130 | + $OUT .= '"}}.'; |
131 | + $OUT .= "\n"; |
132 | + } |
133 | + $OUT .= "\n"; |
134 | +} |
135 | 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 |
136 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers 1970-01-01 01:00:00.000000000 +0100 |
137 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/18LocalUsers 2007-09-20 16:12:29.000000000 +0200 |
138 | @@ -0,0 +1,7 @@ |
139 | +{ |
140 | + $OUT =<<'HERE'; |
141 | +% Local users: |
142 | +{acl, local, {user_regexp, ""}}. |
143 | + |
144 | +HERE |
145 | +} |
146 | 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 |
147 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers 1970-01-01 01:00:00.000000000 +0100 |
148 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/19SMEUsers 2008-05-06 10:23:43.000000000 +0200 |
149 | @@ -0,0 +1,19 @@ |
150 | +{ |
151 | + $OUT =<<'HERE'; |
152 | +% SME server Local users: |
153 | +HERE |
154 | + use esmith::AccountsDB; |
155 | + my $adb = esmith::AccountsDB->open_ro(); |
156 | + my $users; |
157 | + foreach $u ($adb->activeUsers()) { |
158 | + $users .= ("\^" . $u->key() . '$|'); |
159 | + } |
160 | + if (defined $users) { |
161 | + chop $users; |
162 | + $OUT .= '{acl, smeusers, {user_regexp,"'; |
163 | + $OUT .= $users; |
164 | + $OUT .= '"}}.'; |
165 | + $OUT .= "\n"; |
166 | + } |
167 | + $OUT .= "\n"; |
168 | +} |
169 | 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 |
170 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes 1970-01-01 01:00:00.000000000 +0100 |
171 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/20PubSubNodes 2007-09-20 16:12:30.000000000 +0200 |
172 | @@ -0,0 +1,7 @@ |
173 | +{ |
174 | + $OUT =<<'HERE'; |
175 | +% Everybody can create pubsub nodes |
176 | +{access, pubsub_createnode, [{allow, all}]}. |
177 | +HERE |
178 | +} |
179 | + |
180 | 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 |
181 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess 1970-01-01 01:00:00.000000000 +0100 |
182 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/25ConfigurationAccess 2007-09-20 16:12:29.000000000 +0200 |
183 | @@ -0,0 +1,6 @@ |
184 | +{ |
185 | + $OUT =<<'HERE'; |
186 | +% Only admins can use configuration interface: |
187 | +{access, configure, [{allow, admin}]}. |
188 | +HERE |
189 | +} |
190 | 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 |
191 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration 1970-01-01 01:00:00.000000000 +0100 |
192 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/30InBandRegistration 2007-09-28 11:04:50.000000000 +0200 |
193 | @@ -0,0 +1,14 @@ |
194 | +{ |
195 | + $OUT =<<'HERE'; |
196 | +% Every username can be registered via in-band registration: |
197 | +% You could replace {allow, all} with {deny, all} to prevent user from using |
198 | +% in-band registration |
199 | +HERE |
200 | + $OUT .= '{access, register, [{'; |
201 | + my $perm = 'deny,all'; |
202 | + $perm = 'allow,all' if ( ${ejabberd}{Register} eq 'all' ); |
203 | + $perm = 'allow,smeusers' if ( ${ejabberd}{Register} eq 'smeusers' ); |
204 | + $OUT .= $perm; |
205 | + $OUT .= '}]}.'; |
206 | + $OUT .= "\n\n"; |
207 | +} |
208 | 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 |
209 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg 1970-01-01 01:00:00.000000000 +0100 |
210 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/35WelcomeMsg 2007-09-26 06:38:00.000000000 +0200 |
211 | @@ -0,0 +1,26 @@ |
212 | +{ |
213 | + $OUT =<<'HERE'; |
214 | +% After successful registration user will get message with following subject |
215 | +% and body: |
216 | +%{welcome_message, |
217 | +% {"Welcome!", |
218 | +% "Welcome to Instant Messaging server localhost. " |
219 | +% "For information about ejabberd visit http://www.process-one.net/"}}. |
220 | +% Replace them with 'none' if you don't want to send such message: |
221 | +HERE |
222 | + $OUT .= '{welcome_message, '; |
223 | + $OUT .= "\n"; |
224 | + if ( (defined ${ejabberd}{WelcomeSubject}) && ( ${ejabberd}{WelcomeSubject} ne '') ){ |
225 | + $OUT .= ('{"'.${ejabberd}{WelcomeSubject}.'",'); |
226 | + foreach $line ( split /\n/, ${ejabberd}{WelcomeText} ) { |
227 | + $OUT .= ('"'.$line.'"'); |
228 | + $OUT .= "\n"; |
229 | + } |
230 | + $OUT .= '}'; |
231 | + } |
232 | + else { |
233 | + $OUT .= 'none'; |
234 | + } |
235 | + $OUT .= '}.'; |
236 | + $OUT .= "\n"; |
237 | +} |
238 | 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 |
239 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify 1970-01-01 01:00:00.000000000 +0100 |
240 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/40RegisterNotify 2007-09-25 03:16:20.000000000 +0200 |
241 | @@ -0,0 +1,14 @@ |
242 | +{ |
243 | + $OUT =<<'HERE'; |
244 | +% List of people who will get notifications about registered users |
245 | +%{registration_watchers, ["admin1@test.leclere.homeip.com", |
246 | +% "admin2@test.leclere.homeip.com"]}. |
247 | +HERE |
248 | + if ( ${ejabberd}{Notify} eq 'enabled' ) { |
249 | + $OUT .= '{registration_watchers, ["admin@'; |
250 | + $OUT .= ${DomainName}; |
251 | + $OUT .= ']}'; |
252 | + } |
253 | + $OUT .= "\n"; |
254 | +} |
255 | + |
256 | 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 |
257 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement 1970-01-01 01:00:00.000000000 +0100 |
258 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/42Announcement 2007-09-20 16:12:30.000000000 +0200 |
259 | @@ -0,0 +1,6 @@ |
260 | +{ |
261 | + $OUT =<<'HERE'; |
262 | +% Only admins can send announcement messages : |
263 | +{access, announce, [{allow, admin}]}. |
264 | +HERE |
265 | +} |
266 | \ Pas de fin de ligne à la fin du fichier. |
267 | 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 |
268 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf 1970-01-01 01:00:00.000000000 +0100 |
269 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/45c2sS2SConf 2007-09-20 16:12:29.000000000 +0200 |
270 | @@ -0,0 +1,23 @@ |
271 | +{ |
272 | + $OUT =<<'HERE'; |
273 | +% Only non-blocked users can use c2s connections: |
274 | +{access, c2s, [{deny, blocked}, |
275 | + {allow, all}]}. |
276 | + |
277 | +% Set shaper with name "normal" to limit traffic speed to 1000B/s |
278 | +{shaper, normal, {maxrate, 1000}}. |
279 | + |
280 | +% Set shaper with name "fast" to limit traffic speed to 50000B/s |
281 | +{shaper, fast, {maxrate, 50000}}. |
282 | + |
283 | +% For all users except admins used "normal" shaper |
284 | +{access, c2s_shaper, [{none, admin}, |
285 | + {normal, all}]}. |
286 | + |
287 | +% For all S2S connections used "fast" shaper |
288 | +{access, s2s_shaper, [{fast, all}]}. |
289 | + |
290 | +% Admins of this server are also admins of MUC service: |
291 | +{access, muc_admin, [{allow, admin}]}. |
292 | +HERE |
293 | +} |
294 | 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 |
295 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess 1970-01-01 01:00:00.000000000 +0100 |
296 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/50MUCAccess 2008-05-09 00:28:36.000000000 +0200 |
297 | @@ -0,0 +1,8 @@ |
298 | +{ |
299 | + $OUT =<<'HERE'; |
300 | +% All users are allowed to use MUC service: |
301 | +{access, muc, [{allow, all}]}. |
302 | +{access, muc_log, [{allow, admin}, {deny, all}]}. |
303 | +HERE |
304 | +} |
305 | + |
306 | 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 |
307 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess 1970-01-01 01:00:00.000000000 +0100 |
308 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/52AllowAccess 2007-09-20 16:12:29.000000000 +0200 |
309 | @@ -0,0 +1,6 @@ |
310 | +{ |
311 | + $OUT =<<'HERE'; |
312 | +% Allow access only for local users: |
313 | +{access, local, [{allow, local}]}. |
314 | +HERE |
315 | +} |
316 | 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 |
317 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf 1970-01-01 01:00:00.000000000 +0100 |
318 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/55AuthConf 2007-09-20 16:12:30.000000000 +0200 |
319 | @@ -0,0 +1,7 @@ |
320 | +{ |
321 | + $OUT =<<'HERE'; |
322 | +% Authentication method. If you want to use internal user base, then use |
323 | +% this line: |
324 | +{auth_method, internal}. |
325 | +HERE |
326 | +} |
327 | 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 |
328 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName 1970-01-01 01:00:00.000000000 +0100 |
329 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/60HostName 2007-09-20 16:12:30.000000000 +0200 |
330 | @@ -0,0 +1,9 @@ |
331 | +{ |
332 | + $OUT =<<'HERE'; |
333 | +% Host name: |
334 | +HERE |
335 | + $OUT .= '{hosts, ["'; |
336 | + $OUT .= ${ejabberd}{Domain}; |
337 | + $OUT .= '"]}.'; |
338 | + $OUT .= "\n\n"; |
339 | +} |
340 | 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 |
341 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions 1970-01-01 01:00:00.000000000 +0100 |
342 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/65MaxUserSessions 2007-09-20 16:12:30.000000000 +0200 |
343 | @@ -0,0 +1,6 @@ |
344 | +{ |
345 | + $OUT =<<'HERE'; |
346 | +%% Define the maximum number of time a single user is allowed to connect: |
347 | +{max_user_sessions, 10}. |
348 | +HERE |
349 | +} |
350 | 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 |
351 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin 1970-01-01 01:00:00.000000000 +0100 |
352 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/70AnonymousLogin 2007-09-20 16:12:30.000000000 +0200 |
353 | @@ -0,0 +1,13 @@ |
354 | +{ |
355 | + $OUT =<<'HERE'; |
356 | +%% Anonymous login support: |
357 | +%% auth_method: anonymous |
358 | +%% anonymous_protocol: sasl_anon|login_anon|both |
359 | +%% allow_multiple_connections: true|false |
360 | +%%{host_config, "public.example.org", [{auth_method, anonymous}, |
361 | +%% {allow_multiple_connections, false}, |
362 | +%% {anonymous_protocol, sasl_anon}]}. |
363 | +%% To use both anonymous and internal authentication: |
364 | +%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. |
365 | +HERE |
366 | +} |
367 | 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 |
368 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage 1970-01-01 01:00:00.000000000 +0100 |
369 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/75DefaultLanguage 2007-09-20 16:12:30.000000000 +0200 |
370 | @@ -0,0 +1,9 @@ |
371 | +{ |
372 | + $OUT =<<'HERE'; |
373 | +% Default language for server messages |
374 | +HERE |
375 | + $OUT .= '{language, "'; |
376 | + $OUT .= substr(${sysconfig}{Language}, 0, 2); |
377 | + $OUT .= '"}.'; |
378 | + $OUT .= "\n\n"; |
379 | +} |
380 | 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 |
381 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start 1970-01-01 01:00:00.000000000 +0100 |
382 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports00Start 2008-05-06 10:23:43.000000000 +0200 |
383 | @@ -0,0 +1,4 @@ |
384 | +{ |
385 | + $OUT .= "% Listened ports:\n"; |
386 | + $OUT .= "\{listen, ["; |
387 | +} |
388 | 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 |
389 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s 1970-01-01 01:00:00.000000000 +0100 |
390 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s 2008-05-15 12:52:44.000000000 +0200 |
391 | @@ -0,0 +1,33 @@ |
392 | +{ |
393 | + $OUT =<<'HERE'; |
394 | + %%{5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, |
395 | + %% Use this line to enable SSL: |
396 | + %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/server.pem"}]}, |
397 | + %% |
398 | + %% Use those lines instead for TLS support: |
399 | + %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/home/e-smith/server.pem"}]}, |
400 | + %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/server.pem"}]}, |
401 | + |
402 | +HERE |
403 | + if ( ${ejabberd}{XMPPAccess} eq 'tls' ) { |
404 | + $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/home/e-smith/ssl.pem/'; |
405 | + $OUT .= ${SystemName}; |
406 | + $OUT .= ('.' . ${DomainName}); |
407 | + $OUT .= '.pem"}]},'; |
408 | + $OUT .= "\n"; |
409 | + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/ssl.pem/'; |
410 | + $OUT .= ${SystemName}; |
411 | + $OUT .= ('.' . ${DomainName}); |
412 | + $OUT .= '.pem"}]}'; |
413 | + $OUT .= "\n\n"; |
414 | + } |
415 | + else { |
416 | + $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]},'; |
417 | + $OUT .= "\n"; |
418 | + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/ssl.pem/'; |
419 | + $OUT .= ${SystemName}; |
420 | + $OUT .= ('.' . ${DomainName}); |
421 | + $OUT .= '.pem"}]}'; |
422 | + $OUT .= "\n\n"; |
423 | + } |
424 | +} |
425 | \ Pas de fin de ligne à la fin du fichier. |
426 | 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 |
427 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S 1970-01-01 01:00:00.000000000 +0100 |
428 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports20s2S 2008-05-06 10:23:43.000000000 +0200 |
429 | @@ -0,0 +1,6 @@ |
430 | +{ |
431 | + $OUT .=' %% Remove this line if you want to prevent s2s connections:'; |
432 | + $OUT .= "\n"; |
433 | + $OUT .= ' ,{5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}'; |
434 | + $OUT .= "\n"; |
435 | +} |
436 | 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 |
437 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http 1970-01-01 01:00:00.000000000 +0100 |
438 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http 2008-05-15 12:51:06.000000000 +0200 |
439 | @@ -0,0 +1,13 @@ |
440 | +{ |
441 | + $OUT .= ' %% remove http_poll to remove support for http polling'; |
442 | + $OUT .= "\n"; |
443 | + $OUT .= ' %% remove web_admin to disable admin interface:'; |
444 | + $OUT .= "\n"; |
445 | + $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/home/e-smith/ssl.pem/'; |
446 | + $OUT .= ${SystemName}; |
447 | + $OUT .= ('.' . ${DomainName}); |
448 | + $OUT .= '.pem"}, http_poll'; |
449 | + $OUT .= ', web_admin' if (${ejabberd}{WebAdmin} eq 'enabled'); |
450 | + $OUT .= ']}'; |
451 | + $OUT .= "\n"; |
452 | +} |
453 | 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 |
454 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample 1970-01-01 01:00:00.000000000 +0100 |
455 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports40ExternalExample 2008-05-06 10:23:43.000000000 +0200 |
456 | @@ -0,0 +1,10 @@ |
457 | +{ |
458 | + $OUT .= ' %% This is an example on how to define an external service/transport:'; |
459 | + $OUT .= "\n"; |
460 | + $OUT .= ' %%,{8888, ejabberd_service, [{access, all},'; |
461 | + $OUT .= "\n"; |
462 | + $OUT .= ' %% {hosts, ["icq.test.leclere.homeip.com", "sms.test.leclere.homeip.com"],'; |
463 | + $OUT .= "\n"; |
464 | + $OUT .= ' %% [{password, "secret"}]}]}'; |
465 | + $OUT .= "\n"; |
466 | +} |
467 | 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 |
468 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End 1970-01-01 01:00:00.000000000 +0100 |
469 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports99End 2008-05-06 10:23:43.000000000 +0200 |
470 | @@ -0,0 +1,4 @@ |
471 | +{ |
472 | + $OUT .= " ]\}."; |
473 | + $OUT .= "\n\n"; |
474 | +} |
475 | 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 |
476 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut 1970-01-01 01:00:00.000000000 +0100 |
477 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/83PortsOut 2008-05-06 10:23:43.000000000 +0200 |
478 | @@ -0,0 +1,6 @@ |
479 | +{ |
480 | + $OUT .= '% If SRV lookup fails, then port 5269 is used to communicate with remote server'; |
481 | + $OUT .= "\n"; |
482 | + $OUT .= '{outgoing_s2s_port, 5269}.'; |
483 | + $OUT .= "\n\n"; |
484 | +} |
485 | 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 |
486 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules 1970-01-01 01:00:00.000000000 +0100 |
487 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/85Modules 2008-05-09 00:38:26.000000000 +0200 |
488 | @@ -0,0 +1,41 @@ |
489 | +{ |
490 | + $OUT =<<'HERE'; |
491 | +% Used modules: |
492 | +{modules, |
493 | + [ |
494 | + {mod_register, [{access, register}]}, |
495 | + {mod_roster, []}, |
496 | + {mod_privacy, []}, |
497 | + {mod_adhoc, []}, |
498 | + {mod_configure, []}, % Depends on mod_adhoc |
499 | + {mod_configure2, []}, |
500 | + {mod_disco, []}, |
501 | + {mod_stats, []}, |
502 | + {mod_vcard, []}, |
503 | + {mod_caps, []}, |
504 | + {mod_offline, []}, |
505 | + {mod_announce, [{access, announce}]}, % Depends on mod_adhoc |
506 | + {mod_private, []}, |
507 | + {mod_irc, []}, |
508 | +% Default options for mod_muc: |
509 | +% host: "conference." ++ ?MYNAME |
510 | +% access: all |
511 | +% access_create: all |
512 | +% access_admin: none (only room creator has owner privileges) |
513 | + {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, |
514 | + {mod_muc_log, []}, |
515 | + {mod_shared_roster, []}, |
516 | + {mod_pubsub, [{access_createnode, pubsub_createnode}]}, |
517 | + {mod_time, []}, |
518 | + {mod_last, []}, |
519 | +% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, |
520 | + {mod_version, []}, |
521 | + {mod_ctlextra, []}, |
522 | +HERE |
523 | + $OUT .= ' {mod_echo, [{host, "echo.'; |
524 | + $OUT .= ${DomainName}; |
525 | + $OUT .= '"}]}'; |
526 | + $OUT .= "\n"; |
527 | + $OUT .= ' ]}.'; |
528 | + $OUT .= "\n\n"; |
529 | +} |
530 | 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 |
531 | --- 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 |
532 | +++ 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 |
533 | @@ -0,0 +1,9 @@ |
534 | +{ |
535 | + $OUT =<<'HERE'; |
536 | +% $Id: smeserver-ejabberd-2.0.0-removeOpt.patch,v 1.2 2008/05/22 19:43:08 gnujpl Exp $ |
537 | + |
538 | +override_acls. |
539 | +override_global. |
540 | +override_local. |
541 | +HERE |
542 | +} |
543 | 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 |
544 | --- 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 |
545 | +++ 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 |
546 | @@ -0,0 +1,7 @@ |
547 | +{ |
548 | + $OUT =<<'HERE'; |
549 | +% Local Variables: |
550 | +% mode: erlang |
551 | +% End: |
552 | +HERE |
553 | +} |
554 | 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 |
555 | --- 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 |
556 | +++ 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 |
557 | @@ -0,0 +1,28 @@ |
558 | +#! /bin/sh |
559 | + |
560 | + |
561 | +for i in $(seq 1 20); |
562 | +do |
563 | + sv check /service/ejabberd | grep -q 'ok: run:' |
564 | + if [ $? -eq 0 ] |
565 | + then |
566 | + for j in $(seq 1 30); |
567 | + do |
568 | + if [ -f /var/lib/ejabberd/spool/passwd.DCD ] |
569 | + then |
570 | + ls -lt -c /var/lib/ejabberd/spool > /tmp/spoolls-$i$j-last |
571 | + sleep 5 |
572 | + /etc/e-smith/events/actions/ejabberd-load-tables |
573 | + exit 0 |
574 | + fi |
575 | + sleep 2 |
576 | + done |
577 | + echo seems service ejabberd started with errors |
578 | + exit 1 |
579 | + fi |
580 | + echo waiting for service ejabberd to start |
581 | + sleep 1 |
582 | +done |
583 | +echo ejabberd failed to start |
584 | +exit 1 |
585 | + |
586 | 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 |
587 | --- 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 |
588 | +++ 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 |
589 | @@ -8,6 +8,6 @@ |
590 | create 0644 ejabberd ejabberd |
591 | sharedscripts |
592 | postrotate |
593 | - sudo -u ejabberd -H /opt/ejabberd/bin/ejabberdctl reopen-log >/dev/null 2>/dev/null || true |
594 | + sudo -u ejabberd -H /sbin/e-smith/ejabberdctl reopen-log >/dev/null 2>/dev/null || true |
595 | endscript |
596 | \} |
597 | 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 |
598 | --- 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 |
599 | +++ 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 |
600 | @@ -1,8 +0,0 @@ |
601 | -{ |
602 | - $OUT =<<'HERE'; |
603 | -% Users that have admin access. Add line like one of the following after you |
604 | -% will be successfully registered on server to get admin access: |
605 | -{acl, admin, {user, "admin"}}. |
606 | -HERE |
607 | -} |
608 | - |
609 | 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 |
610 | --- 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 |
611 | +++ 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 |
612 | @@ -1,19 +0,0 @@ |
613 | -{ |
614 | - $OUT =<<'HERE'; |
615 | -% Blocked users: |
616 | -%{acl, blocked, {user, "test"}}. |
617 | -HERE |
618 | - use esmith::AccountsDB; |
619 | - my $adb = esmith::AccountsDB->open_ro(); |
620 | - my $users; |
621 | - foreach $u ( grep { $_->prop("PasswordSet") ne 'yes' } $adb->users() ) { |
622 | - $users .= ("^". $u->key() .'$|'); |
623 | - } |
624 | - if ($users) { |
625 | - chop $users; |
626 | - $OUT .= ( '{acl, blocked, {user_regexp,"' . $users ); |
627 | - $OUT .= '"}}.'; |
628 | - $OUT .= "\n"; |
629 | - } |
630 | - $OUT .= "\n"; |
631 | -} |
632 | 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 |
633 | --- 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 |
634 | +++ 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 |
635 | @@ -1,7 +0,0 @@ |
636 | -{ |
637 | - $OUT =<<'HERE'; |
638 | -% Local users: |
639 | -{acl, local, {user_regexp, ""}}. |
640 | - |
641 | -HERE |
642 | -} |
643 | 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 |
644 | --- 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 |
645 | +++ 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 |
646 | @@ -1,19 +0,0 @@ |
647 | -{ |
648 | - $OUT =<<'HERE'; |
649 | -% SME server Local users: |
650 | -HERE |
651 | - use esmith::AccountsDB; |
652 | - my $adb = esmith::AccountsDB->open_ro(); |
653 | - my $users; |
654 | - foreach $u ($adb->activeUsers()) { |
655 | - $users .= ("\^" . $u->key() . '$|'); |
656 | - } |
657 | - if (defined $users) { |
658 | - chop $users; |
659 | - $OUT .= '{acl, smeusers, {user_regexp,"'; |
660 | - $OUT .= $users; |
661 | - $OUT .= '"}}.'; |
662 | - $OUT .= "\n"; |
663 | - } |
664 | - $OUT .= "\n"; |
665 | -} |
666 | 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 |
667 | --- 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 |
668 | +++ 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 |
669 | @@ -1,7 +0,0 @@ |
670 | -{ |
671 | - $OUT =<<'HERE'; |
672 | -% Everybody can create pubsub nodes |
673 | -{access, pubsub_createnode, [{allow, all}]}. |
674 | -HERE |
675 | -} |
676 | - |
677 | 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 |
678 | --- 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 |
679 | +++ 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 |
680 | @@ -1,6 +0,0 @@ |
681 | -{ |
682 | - $OUT =<<'HERE'; |
683 | -% Only admins can use configuration interface: |
684 | -{access, configure, [{allow, admin}]}. |
685 | -HERE |
686 | -} |
687 | 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 |
688 | --- 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 |
689 | +++ 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 |
690 | @@ -1,14 +0,0 @@ |
691 | -{ |
692 | - $OUT =<<'HERE'; |
693 | -% Every username can be registered via in-band registration: |
694 | -% You could replace {allow, all} with {deny, all} to prevent user from using |
695 | -% in-band registration |
696 | -HERE |
697 | - $OUT .= '{access, register, [{'; |
698 | - my $perm = 'deny,all'; |
699 | - $perm = 'allow,all' if ( ${ejabberd}{Register} eq 'all' ); |
700 | - $perm = 'allow,smeusers' if ( ${ejabberd}{Register} eq 'smeusers' ); |
701 | - $OUT .= $perm; |
702 | - $OUT .= '}]}.'; |
703 | - $OUT .= "\n\n"; |
704 | -} |
705 | 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 |
706 | --- 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 |
707 | +++ 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 |
708 | @@ -1,26 +0,0 @@ |
709 | -{ |
710 | - $OUT =<<'HERE'; |
711 | -% After successful registration user will get message with following subject |
712 | -% and body: |
713 | -%{welcome_message, |
714 | -% {"Welcome!", |
715 | -% "Welcome to Instant Messaging server localhost. " |
716 | -% "For information about ejabberd visit http://www.process-one.net/"}}. |
717 | -% Replace them with 'none' if you don't want to send such message: |
718 | -HERE |
719 | - $OUT .= '{welcome_message, '; |
720 | - $OUT .= "\n"; |
721 | - if ( (defined ${ejabberd}{WelcomeSubject}) && ( ${ejabberd}{WelcomeSubject} ne '') ){ |
722 | - $OUT .= ('{"'.${ejabberd}{WelcomeSubject}.'",'); |
723 | - foreach $line ( split /\n/, ${ejabberd}{WelcomeText} ) { |
724 | - $OUT .= ('"'.$line.'"'); |
725 | - $OUT .= "\n"; |
726 | - } |
727 | - $OUT .= '}'; |
728 | - } |
729 | - else { |
730 | - $OUT .= 'none'; |
731 | - } |
732 | - $OUT .= '}.'; |
733 | - $OUT .= "\n"; |
734 | -} |
735 | 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 |
736 | --- 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 |
737 | +++ 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 |
738 | @@ -1,14 +0,0 @@ |
739 | -{ |
740 | - $OUT =<<'HERE'; |
741 | -% List of people who will get notifications about registered users |
742 | -%{registration_watchers, ["admin1@test.leclere.homeip.com", |
743 | -% "admin2@test.leclere.homeip.com"]}. |
744 | -HERE |
745 | - if ( ${ejabberd}{Notify} eq 'enabled' ) { |
746 | - $OUT .= '{registration_watchers, ["admin@'; |
747 | - $OUT .= ${DomainName}; |
748 | - $OUT .= ']}'; |
749 | - } |
750 | - $OUT .= "\n"; |
751 | -} |
752 | - |
753 | 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 |
754 | --- 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 |
755 | +++ 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 |
756 | @@ -1,6 +0,0 @@ |
757 | -{ |
758 | - $OUT =<<'HERE'; |
759 | -% Only admins can send announcement messages : |
760 | -{access, announce, [{allow, admin}]}. |
761 | -HERE |
762 | -} |
763 | \ Pas de fin de ligne à la fin du fichier. |
764 | 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 |
765 | --- 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 |
766 | +++ 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 |
767 | @@ -1,23 +0,0 @@ |
768 | -{ |
769 | - $OUT =<<'HERE'; |
770 | -% Only non-blocked users can use c2s connections: |
771 | -{access, c2s, [{deny, blocked}, |
772 | - {allow, all}]}. |
773 | - |
774 | -% Set shaper with name "normal" to limit traffic speed to 1000B/s |
775 | -{shaper, normal, {maxrate, 1000}}. |
776 | - |
777 | -% Set shaper with name "fast" to limit traffic speed to 50000B/s |
778 | -{shaper, fast, {maxrate, 50000}}. |
779 | - |
780 | -% For all users except admins used "normal" shaper |
781 | -{access, c2s_shaper, [{none, admin}, |
782 | - {normal, all}]}. |
783 | - |
784 | -% For all S2S connections used "fast" shaper |
785 | -{access, s2s_shaper, [{fast, all}]}. |
786 | - |
787 | -% Admins of this server are also admins of MUC service: |
788 | -{access, muc_admin, [{allow, admin}]}. |
789 | -HERE |
790 | -} |
791 | 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 |
792 | --- 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 |
793 | +++ 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 |
794 | @@ -1,8 +0,0 @@ |
795 | -{ |
796 | - $OUT =<<'HERE'; |
797 | -% All users are allowed to use MUC service: |
798 | -{access, muc, [{allow, all}]}. |
799 | -{access, muc_log, [{allow, admin}, {deny, all}]}. |
800 | -HERE |
801 | -} |
802 | - |
803 | 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 |
804 | --- 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 |
805 | +++ 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 |
806 | @@ -1,6 +0,0 @@ |
807 | -{ |
808 | - $OUT =<<'HERE'; |
809 | -% Allow access only for local users: |
810 | -{access, local, [{allow, local}]}. |
811 | -HERE |
812 | -} |
813 | 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 |
814 | --- 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 |
815 | +++ 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 |
816 | @@ -1,7 +0,0 @@ |
817 | -{ |
818 | - $OUT =<<'HERE'; |
819 | -% Authentication method. If you want to use internal user base, then use |
820 | -% this line: |
821 | -{auth_method, internal}. |
822 | -HERE |
823 | -} |
824 | 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 |
825 | --- 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 |
826 | +++ 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 |
827 | @@ -1,9 +0,0 @@ |
828 | -{ |
829 | - $OUT =<<'HERE'; |
830 | -% Host name: |
831 | -HERE |
832 | - $OUT .= '{hosts, ["'; |
833 | - $OUT .= ${ejabberd}{Domain}; |
834 | - $OUT .= '"]}.'; |
835 | - $OUT .= "\n\n"; |
836 | -} |
837 | 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 |
838 | --- 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 |
839 | +++ 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 |
840 | @@ -1,6 +0,0 @@ |
841 | -{ |
842 | - $OUT =<<'HERE'; |
843 | -%% Define the maximum number of time a single user is allowed to connect: |
844 | -{max_user_sessions, 10}. |
845 | -HERE |
846 | -} |
847 | 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 |
848 | --- 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 |
849 | +++ 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 |
850 | @@ -1,13 +0,0 @@ |
851 | -{ |
852 | - $OUT =<<'HERE'; |
853 | -%% Anonymous login support: |
854 | -%% auth_method: anonymous |
855 | -%% anonymous_protocol: sasl_anon|login_anon|both |
856 | -%% allow_multiple_connections: true|false |
857 | -%%{host_config, "public.example.org", [{auth_method, anonymous}, |
858 | -%% {allow_multiple_connections, false}, |
859 | -%% {anonymous_protocol, sasl_anon}]}. |
860 | -%% To use both anonymous and internal authentication: |
861 | -%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. |
862 | -HERE |
863 | -} |
864 | 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 |
865 | --- 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 |
866 | +++ 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 |
867 | @@ -1,9 +0,0 @@ |
868 | -{ |
869 | - $OUT =<<'HERE'; |
870 | -% Default language for server messages |
871 | -HERE |
872 | - $OUT .= '{language, "'; |
873 | - $OUT .= substr(${sysconfig}{Language}, 0, 2); |
874 | - $OUT .= '"}.'; |
875 | - $OUT .= "\n\n"; |
876 | -} |
877 | 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 |
878 | --- 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 |
879 | +++ 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 |
880 | @@ -1,4 +0,0 @@ |
881 | -{ |
882 | - $OUT .= "% Listened ports:\n"; |
883 | - $OUT .= "\{listen, ["; |
884 | -} |
885 | 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 |
886 | --- 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 |
887 | +++ 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 |
888 | @@ -1,33 +0,0 @@ |
889 | -{ |
890 | - $OUT =<<'HERE'; |
891 | - %%{5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, |
892 | - %% Use this line to enable SSL: |
893 | - %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, |
894 | - %% |
895 | - %% Use those lines instead for TLS support: |
896 | - %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, |
897 | - %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/opt/ejabberd/conf/server.pem"}]}, |
898 | - |
899 | -HERE |
900 | - if ( ${ejabberd}{XMPPAccess} eq 'tls' ) { |
901 | - $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/opt/ejabberd/conf/ssl.pem/'; |
902 | - $OUT .= ${SystemName}; |
903 | - $OUT .= ('.' . ${DomainName}); |
904 | - $OUT .= '.pem"}]},'; |
905 | - $OUT .= "\n"; |
906 | - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; |
907 | - $OUT .= ${SystemName}; |
908 | - $OUT .= ('.' . ${DomainName}); |
909 | - $OUT .= '.pem"}]}'; |
910 | - $OUT .= "\n\n"; |
911 | - } |
912 | - else { |
913 | - $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]},'; |
914 | - $OUT .= "\n"; |
915 | - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; |
916 | - $OUT .= ${SystemName}; |
917 | - $OUT .= ('.' . ${DomainName}); |
918 | - $OUT .= '.pem"}]}'; |
919 | - $OUT .= "\n\n"; |
920 | - } |
921 | -} |
922 | \ Pas de fin de ligne à la fin du fichier. |
923 | 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 |
924 | --- 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 |
925 | +++ 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 |
926 | @@ -1,6 +0,0 @@ |
927 | -{ |
928 | - $OUT .=' %% Remove this line if you want to prevent s2s connections:'; |
929 | - $OUT .= "\n"; |
930 | - $OUT .= ' ,{5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}'; |
931 | - $OUT .= "\n"; |
932 | -} |
933 | 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 |
934 | --- 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 |
935 | +++ 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 |
936 | @@ -1,13 +0,0 @@ |
937 | -{ |
938 | - $OUT .= ' %% remove http_poll to remove support for http polling'; |
939 | - $OUT .= "\n"; |
940 | - $OUT .= ' %% remove web_admin to disable admin interface:'; |
941 | - $OUT .= "\n"; |
942 | - $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/opt/ejabberd/conf/ssl.pem/'; |
943 | - $OUT .= ${SystemName}; |
944 | - $OUT .= ('.' . ${DomainName}); |
945 | - $OUT .= '.pem"}, http_poll'; |
946 | - $OUT .= ', web_admin' if (${ejabberd}{WebAdmin} eq 'enabled'); |
947 | - $OUT .= ']}'; |
948 | - $OUT .= "\n"; |
949 | -} |
950 | 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 |
951 | --- 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 |
952 | +++ 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 |
953 | @@ -1,10 +0,0 @@ |
954 | -{ |
955 | - $OUT .= ' %% This is an example on how to define an external service/transport:'; |
956 | - $OUT .= "\n"; |
957 | - $OUT .= ' %%,{8888, ejabberd_service, [{access, all},'; |
958 | - $OUT .= "\n"; |
959 | - $OUT .= ' %% {hosts, ["icq.test.leclere.homeip.com", "sms.test.leclere.homeip.com"],'; |
960 | - $OUT .= "\n"; |
961 | - $OUT .= ' %% [{password, "secret"}]}]}'; |
962 | - $OUT .= "\n"; |
963 | -} |
964 | 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 |
965 | --- 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 |
966 | +++ 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 |
967 | @@ -1,4 +0,0 @@ |
968 | -{ |
969 | - $OUT .= " ]\}."; |
970 | - $OUT .= "\n\n"; |
971 | -} |
972 | 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 |
973 | --- 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 |
974 | +++ 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 |
975 | @@ -1,6 +0,0 @@ |
976 | -{ |
977 | - $OUT .= '% If SRV lookup fails, then port 5269 is used to communicate with remote server'; |
978 | - $OUT .= "\n"; |
979 | - $OUT .= '{outgoing_s2s_port, 5269}.'; |
980 | - $OUT .= "\n\n"; |
981 | -} |
982 | 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 |
983 | --- 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 |
984 | +++ 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 |
985 | @@ -1,41 +0,0 @@ |
986 | -{ |
987 | - $OUT =<<'HERE'; |
988 | -% Used modules: |
989 | -{modules, |
990 | - [ |
991 | - {mod_register, [{access, register}]}, |
992 | - {mod_roster, []}, |
993 | - {mod_privacy, []}, |
994 | - {mod_adhoc, []}, |
995 | - {mod_configure, []}, % Depends on mod_adhoc |
996 | - {mod_configure2, []}, |
997 | - {mod_disco, []}, |
998 | - {mod_stats, []}, |
999 | - {mod_vcard, []}, |
1000 | - {mod_caps, []}, |
1001 | - {mod_offline, []}, |
1002 | - {mod_announce, [{access, announce}]}, % Depends on mod_adhoc |
1003 | - {mod_private, []}, |
1004 | - {mod_irc, []}, |
1005 | -% Default options for mod_muc: |
1006 | -% host: "conference." ++ ?MYNAME |
1007 | -% access: all |
1008 | -% access_create: all |
1009 | -% access_admin: none (only room creator has owner privileges) |
1010 | - {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, |
1011 | - {mod_muc_log, []}, |
1012 | - {mod_shared_roster, []}, |
1013 | - {mod_pubsub, [{access_createnode, pubsub_createnode}]}, |
1014 | - {mod_time, []}, |
1015 | - {mod_last, []}, |
1016 | -% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, |
1017 | - {mod_version, []}, |
1018 | - {mod_ctlextra, []}, |
1019 | -HERE |
1020 | - $OUT .= ' {mod_echo, [{host, "echo.'; |
1021 | - $OUT .= ${DomainName}; |
1022 | - $OUT .= '"}]}'; |
1023 | - $OUT .= "\n"; |
1024 | - $OUT .= ' ]}.'; |
1025 | - $OUT .= "\n\n"; |
1026 | -} |
1027 | 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 |
1028 | --- 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 |
1029 | +++ 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 |
1030 | @@ -1,9 +0,0 @@ |
1031 | -{ |
1032 | - $OUT =<<'HERE'; |
1033 | -% $Id: $ |
1034 | - |
1035 | -override_acls. |
1036 | -override_global. |
1037 | -override_local. |
1038 | -HERE |
1039 | -} |
1040 | 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 |
1041 | --- 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 |
1042 | +++ 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 |
1043 | @@ -1,7 +0,0 @@ |
1044 | -{ |
1045 | - $OUT =<<'HERE'; |
1046 | -% Local Variables: |
1047 | -% mode: erlang |
1048 | -% End: |
1049 | -HERE |
1050 | -} |
1051 | 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 |
1052 | --- 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 |
1053 | +++ 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 |
1054 | @@ -1,21 +0,0 @@ |
1055 | -{ |
1056 | - my $domain = $DomainName || "localdomain"; |
1057 | - my $hostname = $SystemName || "localhost"; |
1058 | - $OUT = ''; |
1059 | - |
1060 | - my $key = $modSSL{'key'}; |
1061 | - unless ($key) |
1062 | - { |
1063 | - $key = "/home/e-smith/ssl.key/$hostname.$domain.key"; |
1064 | - use esmith::templates; |
1065 | - esmith::templates::processTemplate({ |
1066 | - TEMPLATE_PATH => "/home/e-smith/ssl.key/key", |
1067 | - OUTPUT_FILENAME => $key, |
1068 | - }); |
1069 | - } |
1070 | - open(KEY, $key) or die "Could not open key file: $!"; |
1071 | - my @key = <KEY>; |
1072 | - chomp @key; |
1073 | - $OUT = join "\n", @key; |
1074 | - close KEY; |
1075 | -} |
1076 | 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 |
1077 | --- 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 |
1078 | +++ 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 |
1079 | @@ -1,20 +0,0 @@ |
1080 | -{ |
1081 | - my $domain = $DomainName || "localdomain"; |
1082 | - my $hostname = $SystemName || "localhost"; |
1083 | - |
1084 | - my $crt = $modSSL{'crt'}; |
1085 | - unless ($crt) |
1086 | - { |
1087 | - $crt = "/home/e-smith/ssl.crt/$hostname.$domain.crt"; |
1088 | - use esmith::templates; |
1089 | - esmith::templates::processTemplate({ |
1090 | - TEMPLATE_PATH => "/home/e-smith/ssl.crt/crt", |
1091 | - OUTPUT_FILENAME => $crt, |
1092 | - }); |
1093 | - } |
1094 | - open(CRT, $crt) or die "Could not open crt file: $!"; |
1095 | - my @crt = <CRT>; |
1096 | - chomp @crt; |
1097 | - $OUT = join "\n", @crt; |
1098 | - close CRT; |
1099 | -} |
1100 | 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 |
1101 | --- smeserver-ejabberd-2.0.0-1/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg 1970-01-01 01:00:00.000000000 +0100 |
1102 | +++ smeserver-ejabberd-2.0.0-2/root/etc/e-smith/templates.metadata/etc/ejabberd/ejabberd.cfg 2008-05-15 12:53:52.000000000 +0200 |
1103 | @@ -0,0 +1,3 @@ |
1104 | +PERMS=0640 |
1105 | +UID="ejabberd" |
1106 | +GID="ejabberd" |
1107 | 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 |
1108 | --- 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 |
1109 | +++ 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 |
1110 | @@ -0,0 +1 @@ |
1111 | +PERMS=0540 |
1112 | 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 |
1113 | --- 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 |
1114 | +++ 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 |
1115 | @@ -0,0 +1 @@ |
1116 | +PERMS=0755 |
1117 | \ Pas de fin de ligne à la fin du fichier. |
1118 | 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 |
1119 | --- 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 |
1120 | +++ 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 |
1121 | @@ -1,3 +0,0 @@ |
1122 | -PERMS=0640 |
1123 | -UID="root" |
1124 | -GID="ejabberd" |
1125 | 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 |
1126 | --- 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 |
1127 | +++ 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 |
1128 | @@ -1,5 +0,0 @@ |
1129 | -TEMPLATE_PATH="/opt/ejabberd/conf/ssl.pem" |
1130 | -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" |
1131 | -UID="ejabberd" |
1132 | -GID="root" |
1133 | -PERMS=0460 |
1134 | \ Pas de fin de ligne à la fin du fichier. |
1135 | 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 |
1136 | --- smeserver-ejabberd-2.0.0-1/root/etc/rc.d/init.d/ejabberd.init 1970-01-01 01:00:00.000000000 +0100 |
1137 | +++ smeserver-ejabberd-2.0.0-2/root/etc/rc.d/init.d/ejabberd.init 2008-05-20 02:18:00.000000000 +0200 |
1138 | @@ -0,0 +1,36 @@ |
1139 | +#!/bin/sh |
1140 | +# |
1141 | + |
1142 | +# Source function library. |
1143 | +. /etc/rc.d/init.d/functions |
1144 | + |
1145 | +if [ $# -lt 1 ]; then |
1146 | + echo "Usage: $0 <start|restart>" 1>&2 |
1147 | + exit 1 |
1148 | +fi |
1149 | +# We should only do something if $1 is 'start'. |
1150 | +if [ $1 != "start" ] && [ $1 != "restart" ]; then |
1151 | + exit 0 |
1152 | +fi |
1153 | + |
1154 | + sv check /service/ejabberd | grep -q 'ok: run:' |
1155 | + if [ $? -eq 0 ] |
1156 | + then |
1157 | + exit_value=0 |
1158 | + HOME=/root |
1159 | + export HOME |
1160 | + for link in $(find /etc/e-smith/mnesia/init -type f -o -type l | sort) |
1161 | + do |
1162 | + F=$(basename $link | sed s/S[0-9][0-9]//) |
1163 | + case $F in |
1164 | + *) |
1165 | + action "Executing mnesia update $F " $link && /bin/rm $link |
1166 | + ;; |
1167 | + esac |
1168 | + # Record any failure for the final return value. |
1169 | + if [ $? -ne 0 ]; then |
1170 | + exit_value=1 |
1171 | + fi |
1172 | + done |
1173 | + exit $exit_value |
1174 | + fi |
1175 | 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 |
1176 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/bin/preuninstall.sh 2008-05-11 22:22:00.000000000 +0200 |
1177 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/bin/preuninstall.sh 1970-01-01 01:00:00.000000000 +0100 |
1178 | @@ -1,16 +0,0 @@ |
1179 | -#!/bin/sh |
1180 | - |
1181 | -echo |
1182 | -echo " -=- SME Server ejabberd pre uninstallation script -=- " |
1183 | -echo " (c) 2008 Free-EOS " |
1184 | -echo |
1185 | -echo "* Stopping ejabberd instance" |
1186 | -/sbin/e-smith/ejabberdctl stop |
1187 | -echo |
1188 | -echo "* Stopping Erlang Portmapper Deamon" |
1189 | -/usr/lib/erlang/bin/epmd -kill |
1190 | -cd /service/ejabberd |
1191 | -rm /service/ejabberd |
1192 | -svc -dx . log |
1193 | -echo |
1194 | -echo "==> Pre uninstallation tasks finished" |
1195 | 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 |
1196 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberd.cfg 2008-04-27 22:55:03.000000000 +0200 |
1197 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberd.cfg 1970-01-01 01:00:00.000000000 +0100 |
1198 | @@ -1,174 +0,0 @@ |
1199 | -% $Id: $ |
1200 | - |
1201 | -%override_acls. |
1202 | - |
1203 | -% Users that have admin access. Add line like one of the following after you |
1204 | -% will be successfully registered on server to get admin access: |
1205 | -{acl, admin, {user, "admin"}}. |
1206 | - |
1207 | -% Blocked users: |
1208 | -%{acl, blocked, {user, "test"}}. |
1209 | - |
1210 | -% Local users: |
1211 | -{acl, local, {user_regexp, ""}}. |
1212 | - |
1213 | -% Another examples of ACLs: |
1214 | -%{acl, jabberorg, {server, "jabber.org"}}. |
1215 | -%{acl, aleksey, {user, "aleksey", "jabber.ru"}}. |
1216 | -%{acl, test, {user_regexp, "^test"}}. |
1217 | -%{acl, test, {user_glob, "test*"}}. |
1218 | - |
1219 | -% Everybody can create pubsub nodes |
1220 | -{access, pubsub_createnode, [{allow, all}]}. |
1221 | - |
1222 | -% Only admins can use configuration interface: |
1223 | -{access, configure, [{allow, admin}]}. |
1224 | - |
1225 | -% Every username can be registered via in-band registration: |
1226 | -% You could replace {allow, all} with {deny, all} to prevent user from using |
1227 | -% in-band registration |
1228 | -{access, register, [{allow, all}]}. |
1229 | - |
1230 | -% After successful registration user will get message with following subject |
1231 | -% and body: |
1232 | -%{welcome_message, |
1233 | -% {"Welcome!", |
1234 | -% "Welcome to Instant Messaging server localhost. " |
1235 | -% "For information about ejabberd visit http://www.process-one.net/"}}. |
1236 | -% Replace them with 'none' if you don't want to send such message: |
1237 | -{welcome_message, none}. |
1238 | - |
1239 | -% List of people who will get notifications about registered users |
1240 | -%{registration_watchers, ["admin1@localhost.localdomain", |
1241 | -% "admin2@localhost.localdomain"]}. |
1242 | - |
1243 | -% Only admins can send announcement messages: |
1244 | -{access, announce, [{allow, admin}]}. |
1245 | - |
1246 | -% Only non-blocked users can use c2s connections: |
1247 | -{access, c2s, [{deny, blocked}, |
1248 | - {allow, all}]}. |
1249 | - |
1250 | -% Set shaper with name "normal" to limit traffic speed to 1000B/s |
1251 | -{shaper, normal, {maxrate, 1000}}. |
1252 | - |
1253 | -% Set shaper with name "fast" to limit traffic speed to 50000B/s |
1254 | -{shaper, fast, {maxrate, 50000}}. |
1255 | - |
1256 | -% For all users except admins used "normal" shaper |
1257 | -{access, c2s_shaper, [{none, admin}, |
1258 | - {normal, all}]}. |
1259 | - |
1260 | -% For all S2S connections used "fast" shaper |
1261 | -{access, s2s_shaper, [{fast, all}]}. |
1262 | - |
1263 | -% Admins of this server are also admins of MUC service: |
1264 | -{access, muc_admin, [{allow, admin}]}. |
1265 | - |
1266 | -% All users are allowed to use MUC service: |
1267 | -{access, muc, [{allow, all}]}. |
1268 | - |
1269 | -% This rule allows access only for local users: |
1270 | -{access, local, [{allow, local}]}. |
1271 | - |
1272 | - |
1273 | -% Authentication method. If you want to use internal user base, then use |
1274 | -% this line: |
1275 | -{auth_method, internal}. |
1276 | - |
1277 | -% For LDAP authentication use these lines instead of above one: |
1278 | -%{auth_method, ldap}. |
1279 | -%{ldap_servers, ["localhost.localdomain"]}. % List of LDAP servers |
1280 | -%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID |
1281 | -%{ldap_base, "dc=example,dc=com"}. % Search base of LDAP directory |
1282 | -%{ldap_rootdn, "dc=example,dc=com"}. % LDAP manager |
1283 | -%{ldap_password, "******"}. % Password to LDAP manager |
1284 | - |
1285 | -% For authentication via external script use the following: |
1286 | -%{auth_method, external}. |
1287 | -%{extauth_program, "/path/to/authentication/script"}. |
1288 | - |
1289 | -% For authentication via ODBC use the following: |
1290 | -%{auth_method, odbc}. |
1291 | -%{odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}. |
1292 | - |
1293 | -% Host name: |
1294 | -{hosts, ["localhost.localdomain"]}. |
1295 | - |
1296 | -%% Define the maximum number of time a single user is allowed to connect: |
1297 | -{max_user_sessions, 10}. |
1298 | - |
1299 | -%% Anonymous login support: |
1300 | -%% auth_method: anonymous |
1301 | -%% anonymous_protocol: sasl_anon|login_anon|both |
1302 | -%% allow_multiple_connections: true|false |
1303 | -%%{host_config, "public.example.org", [{auth_method, anonymous}, |
1304 | -%% {allow_multiple_connections, false}, |
1305 | -%% {anonymous_protocol, sasl_anon}]}. |
1306 | -%% To use both anonymous and internal authentication: |
1307 | -%%{host_config, "public.example.org", [{auth_method, [anonymous, internal]}]}. |
1308 | - |
1309 | -% Default language for server messages |
1310 | -% TODO: Use installer selection |
1311 | -{language, "en"}. |
1312 | - |
1313 | -% Listened ports: |
1314 | -{listen, [ |
1315 | - {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, |
1316 | - %% Use this line to enable SSL: |
1317 | - %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, |
1318 | - %% |
1319 | - %% Use those lines instead for TLS support: |
1320 | - %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, |
1321 | - %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "root/opt/ejabberd/conf/server.pem"}]}, |
1322 | - |
1323 | - %% Remove this line if you want to prevent s2s connections: |
1324 | - {5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, {max_stanza_size, 131072}]}, |
1325 | - |
1326 | - %% remove http_poll to remove support for http polling |
1327 | - %% remove web_admin to disable admin interface: |
1328 | - {5280, ejabberd_http, [http_poll, web_admin]} |
1329 | - %% This is an example on how to define an external service/transport: |
1330 | - %%{8888, ejabberd_service, [{access, all}, |
1331 | - %% {hosts, ["icq.localhost.localdomain", "sms.localhost.localdomain"], |
1332 | - %% [{password, "secret"}]}]} |
1333 | - ]}. |
1334 | - |
1335 | -% If SRV lookup fails, then port 5269 is used to communicate with remote server |
1336 | -{outgoing_s2s_port, 5269}. |
1337 | - |
1338 | -% Used modules: |
1339 | -{modules, |
1340 | - [ |
1341 | - {mod_register, [{access, register}]}, |
1342 | - {mod_roster, []}, |
1343 | - {mod_privacy, []}, |
1344 | - {mod_adhoc, []}, |
1345 | - {mod_configure, []}, % Depends on mod_adhoc |
1346 | - {mod_configure2, []}, |
1347 | - {mod_disco, []}, |
1348 | - {mod_stats, []}, |
1349 | - {mod_vcard, []}, |
1350 | - {mod_offline, []}, |
1351 | - {mod_announce, [{access, announce}]}, % Depends on mod_adhoc |
1352 | - {mod_echo, [{host, "echo.localhost.localdomain"}]}, |
1353 | - {mod_private, []}, |
1354 | - {mod_irc, []}, |
1355 | -% Default options for mod_muc: |
1356 | -% host: "conference." ++ ?MYNAME |
1357 | -% access: all |
1358 | -% access_create: all |
1359 | -% access_admin: none (only room creator has owner privileges) |
1360 | - {mod_muc, [{access, muc}, {access_create, muc}, {access_admin, muc_admin}]}, |
1361 | -% {mod_muc_log, []}, |
1362 | -% {mod_shared_roster, []}, |
1363 | - {mod_pubsub, [{access_createnode, pubsub_createnode}]}, |
1364 | - {mod_time, []}, |
1365 | - {mod_last, []}, |
1366 | -% {mod_xmlrpc,[{port, 4560},{timeout, 5000}]}, |
1367 | - {mod_version, []} |
1368 | - ]}. |
1369 | - |
1370 | -% Local Variables: |
1371 | -% mode: erlang |
1372 | -% End: |
1373 | 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 |
1374 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/ejabberdctl.cfg 2008-05-11 21:59:00.000000000 +0200 |
1375 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/ejabberdctl.cfg 1970-01-01 01:00:00.000000000 +0100 |
1376 | @@ -1,75 +0,0 @@ |
1377 | -# |
1378 | -# In this file you can configure options that are passed by ejabberdctl |
1379 | -# to the erlang runtime system when starting ejabberd |
1380 | -# |
1381 | - |
1382 | -# POLL: Kernel polling ([true|false]) |
1383 | -# |
1384 | -# The kernel polling option requires support in the kernel. |
1385 | -# Additionaly, you need to enable this feature while compiling Erlang. |
1386 | -# |
1387 | -# Default: true |
1388 | -# |
1389 | -POLL=true |
1390 | - |
1391 | -# SMP: SMP support ([enable|auto|disable]) |
1392 | -# |
1393 | -# Explanation in Erlang/OTP documentation: |
1394 | -# enable: starts the Erlang runtime system with SMP support enabled. |
1395 | -# This may fail if no runtime system with SMP support is available. |
1396 | -# auto: starts the Erlang runtime system with SMP support enabled if it |
1397 | -# is available and more than one logical processor are detected. |
1398 | -# disable: starts a runtime system without SMP support. |
1399 | -# |
1400 | -# Default: auto |
1401 | -# |
1402 | -SMP=auto |
1403 | - |
1404 | -# ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports |
1405 | -# |
1406 | -# ejabberd consumes two or three ports for every connection, either |
1407 | -# from a client or from another Jabber server. So take this into |
1408 | -# account when setting this limit. |
1409 | -# |
1410 | -# Default: 32000 |
1411 | -# Maximum: 268435456 |
1412 | -# |
1413 | -ERL_MAX_PORTS=32000 |
1414 | - |
1415 | -# PROCESSES: Maximum number of Erlang processes |
1416 | -# |
1417 | -# Erlang consumes a lot of lightweight processes. If there is a lot of activity |
1418 | -# on ejabberd so that the maximum number of proccesses is reached, people will |
1419 | -# experiment greater latency times. As these processes are implemented in |
1420 | -# Erlang, and therefore not related to the operating system processes, you do |
1421 | -# not have to worry about allowing a huge number of them. |
1422 | -# |
1423 | -# Default: 250000 |
1424 | -# Maximum: 268435456 |
1425 | -# |
1426 | -ERL_PROCESSES=250000 |
1427 | - |
1428 | -# ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables |
1429 | -# |
1430 | -# The number of concurrent ETS and Mnesia tables is limited. When the limit is |
1431 | -# reached, errors will appear in the logs: |
1432 | -# ** Too many db tables ** |
1433 | -# You can safely increase this limit when starting ejabberd. It impacts memory |
1434 | -# consumption but the difference will be quite small. |
1435 | -# |
1436 | -# Default: 1400 |
1437 | -# |
1438 | -ERL_MAX_ETS_TABLES=1400 |
1439 | - |
1440 | -# The next variable allows to explicitly specify erlang node for ejabberd |
1441 | -# It can be given in different formats: |
1442 | -# ERLANG_NODE=ejabberd |
1443 | -# Lets erlang add hostname to the node (ejabberd uses short name in this case) |
1444 | -# ERLANG_NODE=ejabberd@hostname |
1445 | -# Erlang uses node name as is (so make sure that hostname is a real |
1446 | -# machine hostname or you'll not be able to control ejabberd) |
1447 | -# ERLANG_NODE=ejabberd@hostname.domainname |
1448 | -# The same as previous, but erlang will use long hostname |
1449 | -# (see erl (1) manual for details) |
1450 | -# |
1451 | -ERLANG_NODE=ejabberd |
1452 | diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/inetrc smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/inetrc |
1453 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/inetrc 2008-05-06 20:18:11.000000000 +0200 |
1454 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/inetrc 1970-01-01 01:00:00.000000000 +0100 |
1455 | @@ -1,3 +0,0 @@ |
1456 | -{lookup,["file","native"]}. |
1457 | -{host,{127,0,0,1}, ["localhost","localhost"]}. |
1458 | -{file, resolv, "/etc/resolv.conf"}. |
1459 | 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 |
1460 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/conf/server.pem 2008-02-21 12:27:18.000000000 +0100 |
1461 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/conf/server.pem 1970-01-01 01:00:00.000000000 +0100 |
1462 | @@ -1,37 +0,0 @@ |
1463 | ------BEGIN CERTIFICATE----- |
1464 | -MIIDvDCCAyWgAwIBAgIJAOBE76dYOsdsMA0GCSqGSIb3DQEBBAUAMIGbMQswCQYD |
1465 | -VQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQYXJpczEXMBUGA1UEChMO |
1466 | -VGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mtb25lMRcwFQYDVQQDEw5N |
1467 | -aWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29udGFjdEBwcm9jZXNzLW9u |
1468 | -ZS5uZXQwHhcNMDYwMzAzMTYwNjQ2WhcNMTYwMjI5MTYwNjQ2WjCBmzELMAkGA1UE |
1469 | -BhMCRlIxDDAKBgNVBAgTA0lERjEOMAwGA1UEBxMFUGFyaXMxFzAVBgNVBAoTDlRl |
1470 | -c3QgU2VydmVyIFAxMRQwEgYDVQQLEwtQcm9jZXNzLW9uZTEXMBUGA1UEAxMOTWlj |
1471 | -a2FlbCBSZW1vbmQxJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RAcHJvY2Vzcy1vbmUu |
1472 | -bmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8sZ/Wb2GqYPL43OBzBNz0 |
1473 | -gFT1iDZMLLgpMYqBZElKul7GGCdLZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay |
1474 | -4+Ef7Y6zdjXAsYGtYhdmms6icCk1RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4 |
1475 | -276RcZSukN2AR4/pziWysQIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFMBW8llnB7AA |
1476 | -hu9u+ivBndDdbmLTMIHQBgNVHSMEgcgwgcWAFMBW8llnB7AAhu9u+ivBndDdbmLT |
1477 | -oYGhpIGeMIGbMQswCQYDVQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQ |
1478 | -YXJpczEXMBUGA1UEChMOVGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mt |
1479 | -b25lMRcwFQYDVQQDEw5NaWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29u |
1480 | -dGFjdEBwcm9jZXNzLW9uZS5uZXSCCQDgRO+nWDrHbDAMBgNVHRMEBTADAQH/MA0G |
1481 | -CSqGSIb3DQEBBAUAA4GBAGtYeVL7BlksuXf79V/WfBPosKD4yVzs7P9GsgS/D10T |
1482 | -HMIRbjIOma4IVy8Es/UBJ0Q4gPojVg4lPo3xv/PSgSDJfbcJyWjSbAh0eGvHtNc5 |
1483 | -4GnYVx5ox0o0MBR8Mt0ChbwA5QMSo6bqc5tRK6+B+ib4ELix7MCSq3wdh7HcuL9D |
1484 | ------END CERTIFICATE----- |
1485 | ------BEGIN RSA PRIVATE KEY----- |
1486 | -MIICXQIBAAKBgQC8sZ/Wb2GqYPL43OBzBNz0gFT1iDZMLLgpMYqBZElKul7GGCdL |
1487 | -ZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay4+Ef7Y6zdjXAsYGtYhdmms6icCk1 |
1488 | -RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4276RcZSukN2AR4/pziWysQIDAQAB |
1489 | -AoGADl1DOrK975dzx6gg2gCrxV0jmpFk+MWKu3APCCyXO74WSuQ50Y5v25Dogwxc |
1490 | -qFYgW1qLvNBHhkpyJg0Up6kkGUalWNgdX/D63QMA/HeSLIpuUsoTGt/F3yu5wcaJ |
1491 | -8y+WVZ5fcNK+rSYyNdnxv0+euazr2HUpfe5zqscGMdT5kDECQQDop9vLcop4aPkd |
1492 | -h5e/AJt6irb/GQt7MBYZzxI+lof8SoASyL3EcMjZI002JCLXWirOX47eO7G7v/D1 |
1493 | -v7feRz3dAkEAz6CIqd9nHPT1QNmhb6QANC6Cy1PzQdAOjxz+0CRHzPBOy+bnHI00 |
1494 | -921RQdCiJ/KEp4olDrTVOMkjbKa928kM5QJBAJspuBDLZ0Y+3EWxdKbSBN+JO9qO |
1495 | -HXYe795ul8BeLHs6RIhCkS09+vW18Xy2RPZTEFFqsaHNNg/9RvrezgXUhZECQQCp |
1496 | -Tk3Cv9J0cWeALzcOM1ybMIYlSVqmgwMsPkem8L6/5gFLEgnJZXgYf0LweTGRg5ga |
1497 | -inK3cEwilxnU4o8VJvflAkBcd/gsVklKfr0Z+vcfjoXsIAN5DoWQYozo7omUIudS |
1498 | -5wjh6y5uYtkhazIJRxNUi9WMfKqhnrje0NfG+p+Sxs7J |
1499 | ------END RSA PRIVATE KEY----- |
1500 | diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/COPYING smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/COPYING |
1501 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/COPYING 2008-02-21 12:27:18.000000000 +0100 |
1502 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/COPYING 1970-01-01 01:00:00.000000000 +0100 |
1503 | @@ -1,343 +0,0 @@ |
1504 | -As a special exception, the authors give permission to link this program |
1505 | -with the OpenSSL library and distribute the resulting binary. |
1506 | - |
1507 | - GNU GENERAL PUBLIC LICENSE |
1508 | - Version 2, June 1991 |
1509 | - |
1510 | - Copyright (C) 1989, 1991 Free Software Foundation, Inc. |
1511 | - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
1512 | - Everyone is permitted to copy and distribute verbatim copies |
1513 | - of this license document, but changing it is not allowed. |
1514 | - |
1515 | - Preamble |
1516 | - |
1517 | - The licenses for most software are designed to take away your |
1518 | -freedom to share and change it. By contrast, the GNU General Public |
1519 | -License is intended to guarantee your freedom to share and change free |
1520 | -software--to make sure the software is free for all its users. This |
1521 | -General Public License applies to most of the Free Software |
1522 | -Foundation's software and to any other program whose authors commit to |
1523 | -using it. (Some other Free Software Foundation software is covered by |
1524 | -the GNU Library General Public License instead.) You can apply it to |
1525 | -your programs, too. |
1526 | - |
1527 | - When we speak of free software, we are referring to freedom, not |
1528 | -price. Our General Public Licenses are designed to make sure that you |
1529 | -have the freedom to distribute copies of free software (and charge for |
1530 | -this service if you wish), that you receive source code or can get it |
1531 | -if you want it, that you can change the software or use pieces of it |
1532 | -in new free programs; and that you know you can do these things. |
1533 | - |
1534 | - To protect your rights, we need to make restrictions that forbid |
1535 | -anyone to deny you these rights or to ask you to surrender the rights. |
1536 | -These restrictions translate to certain responsibilities for you if you |
1537 | -distribute copies of the software, or if you modify it. |
1538 | - |
1539 | - For example, if you distribute copies of such a program, whether |
1540 | -gratis or for a fee, you must give the recipients all the rights that |
1541 | -you have. You must make sure that they, too, receive or can get the |
1542 | -source code. And you must show them these terms so they know their |
1543 | -rights. |
1544 | - |
1545 | - We protect your rights with two steps: (1) copyright the software, and |
1546 | -(2) offer you this license which gives you legal permission to copy, |
1547 | -distribute and/or modify the software. |
1548 | - |
1549 | - Also, for each author's protection and ours, we want to make certain |
1550 | -that everyone understands that there is no warranty for this free |
1551 | -software. If the software is modified by someone else and passed on, we |
1552 | -want its recipients to know that what they have is not the original, so |
1553 | -that any problems introduced by others will not reflect on the original |
1554 | -authors' reputations. |
1555 | - |
1556 | - Finally, any free program is threatened constantly by software |
1557 | -patents. We wish to avoid the danger that redistributors of a free |
1558 | -program will individually obtain patent licenses, in effect making the |
1559 | -program proprietary. To prevent this, we have made it clear that any |
1560 | -patent must be licensed for everyone's free use or not licensed at all. |
1561 | - |
1562 | - The precise terms and conditions for copying, distribution and |
1563 | -modification follow. |
1564 | - |
1565 | - GNU GENERAL PUBLIC LICENSE |
1566 | - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
1567 | - |
1568 | - 0. This License applies to any program or other work which contains |
1569 | -a notice placed by the copyright holder saying it may be distributed |
1570 | -under the terms of this General Public License. The "Program", below, |
1571 | -refers to any such program or work, and a "work based on the Program" |
1572 | -means either the Program or any derivative work under copyright law: |
1573 | -that is to say, a work containing the Program or a portion of it, |
1574 | -either verbatim or with modifications and/or translated into another |
1575 | -language. (Hereinafter, translation is included without limitation in |
1576 | -the term "modification".) Each licensee is addressed as "you". |
1577 | - |
1578 | -Activities other than copying, distribution and modification are not |
1579 | -covered by this License; they are outside its scope. The act of |
1580 | -running the Program is not restricted, and the output from the Program |
1581 | -is covered only if its contents constitute a work based on the |
1582 | -Program (independent of having been made by running the Program). |
1583 | -Whether that is true depends on what the Program does. |
1584 | - |
1585 | - 1. You may copy and distribute verbatim copies of the Program's |
1586 | -source code as you receive it, in any medium, provided that you |
1587 | -conspicuously and appropriately publish on each copy an appropriate |
1588 | -copyright notice and disclaimer of warranty; keep intact all the |
1589 | -notices that refer to this License and to the absence of any warranty; |
1590 | -and give any other recipients of the Program a copy of this License |
1591 | -along with the Program. |
1592 | - |
1593 | -You may charge a fee for the physical act of transferring a copy, and |
1594 | -you may at your option offer warranty protection in exchange for a fee. |
1595 | - |
1596 | - 2. You may modify your copy or copies of the Program or any portion |
1597 | -of it, thus forming a work based on the Program, and copy and |
1598 | -distribute such modifications or work under the terms of Section 1 |
1599 | -above, provided that you also meet all of these conditions: |
1600 | - |
1601 | - a) You must cause the modified files to carry prominent notices |
1602 | - stating that you changed the files and the date of any change. |
1603 | - |
1604 | - b) You must cause any work that you distribute or publish, that in |
1605 | - whole or in part contains or is derived from the Program or any |
1606 | - part thereof, to be licensed as a whole at no charge to all third |
1607 | - parties under the terms of this License. |
1608 | - |
1609 | - c) If the modified program normally reads commands interactively |
1610 | - when run, you must cause it, when started running for such |
1611 | - interactive use in the most ordinary way, to print or display an |
1612 | - announcement including an appropriate copyright notice and a |
1613 | - notice that there is no warranty (or else, saying that you provide |
1614 | - a warranty) and that users may redistribute the program under |
1615 | - these conditions, and telling the user how to view a copy of this |
1616 | - License. (Exception: if the Program itself is interactive but |
1617 | - does not normally print such an announcement, your work based on |
1618 | - the Program is not required to print an announcement.) |
1619 | - |
1620 | -These requirements apply to the modified work as a whole. If |
1621 | -identifiable sections of that work are not derived from the Program, |
1622 | -and can be reasonably considered independent and separate works in |
1623 | -themselves, then this License, and its terms, do not apply to those |
1624 | -sections when you distribute them as separate works. But when you |
1625 | -distribute the same sections as part of a whole which is a work based |
1626 | -on the Program, the distribution of the whole must be on the terms of |
1627 | -this License, whose permissions for other licensees extend to the |
1628 | -entire whole, and thus to each and every part regardless of who wrote it. |
1629 | - |
1630 | -Thus, it is not the intent of this section to claim rights or contest |
1631 | -your rights to work written entirely by you; rather, the intent is to |
1632 | -exercise the right to control the distribution of derivative or |
1633 | -collective works based on the Program. |
1634 | - |
1635 | -In addition, mere aggregation of another work not based on the Program |
1636 | -with the Program (or with a work based on the Program) on a volume of |
1637 | -a storage or distribution medium does not bring the other work under |
1638 | -the scope of this License. |
1639 | - |
1640 | - 3. You may copy and distribute the Program (or a work based on it, |
1641 | -under Section 2) in object code or executable form under the terms of |
1642 | -Sections 1 and 2 above provided that you also do one of the following: |
1643 | - |
1644 | - a) Accompany it with the complete corresponding machine-readable |
1645 | - source code, which must be distributed under the terms of Sections |
1646 | - 1 and 2 above on a medium customarily used for software interchange; or, |
1647 | - |
1648 | - b) Accompany it with a written offer, valid for at least three |
1649 | - years, to give any third party, for a charge no more than your |
1650 | - cost of physically performing source distribution, a complete |
1651 | - machine-readable copy of the corresponding source code, to be |
1652 | - distributed under the terms of Sections 1 and 2 above on a medium |
1653 | - customarily used for software interchange; or, |
1654 | - |
1655 | - c) Accompany it with the information you received as to the offer |
1656 | - to distribute corresponding source code. (This alternative is |
1657 | - allowed only for noncommercial distribution and only if you |
1658 | - received the program in object code or executable form with such |
1659 | - an offer, in accord with Subsection b above.) |
1660 | - |
1661 | -The source code for a work means the preferred form of the work for |
1662 | -making modifications to it. For an executable work, complete source |
1663 | -code means all the source code for all modules it contains, plus any |
1664 | -associated interface definition files, plus the scripts used to |
1665 | -control compilation and installation of the executable. However, as a |
1666 | -special exception, the source code distributed need not include |
1667 | -anything that is normally distributed (in either source or binary |
1668 | -form) with the major components (compiler, kernel, and so on) of the |
1669 | -operating system on which the executable runs, unless that component |
1670 | -itself accompanies the executable. |
1671 | - |
1672 | -If distribution of executable or object code is made by offering |
1673 | -access to copy from a designated place, then offering equivalent |
1674 | -access to copy the source code from the same place counts as |
1675 | -distribution of the source code, even though third parties are not |
1676 | -compelled to copy the source along with the object code. |
1677 | - |
1678 | - 4. You may not copy, modify, sublicense, or distribute the Program |
1679 | -except as expressly provided under this License. Any attempt |
1680 | -otherwise to copy, modify, sublicense or distribute the Program is |
1681 | -void, and will automatically terminate your rights under this License. |
1682 | -However, parties who have received copies, or rights, from you under |
1683 | -this License will not have their licenses terminated so long as such |
1684 | -parties remain in full compliance. |
1685 | - |
1686 | - 5. You are not required to accept this License, since you have not |
1687 | -signed it. However, nothing else grants you permission to modify or |
1688 | -distribute the Program or its derivative works. These actions are |
1689 | -prohibited by law if you do not accept this License. Therefore, by |
1690 | -modifying or distributing the Program (or any work based on the |
1691 | -Program), you indicate your acceptance of this License to do so, and |
1692 | -all its terms and conditions for copying, distributing or modifying |
1693 | -the Program or works based on it. |
1694 | - |
1695 | - 6. Each time you redistribute the Program (or any work based on the |
1696 | -Program), the recipient automatically receives a license from the |
1697 | -original licensor to copy, distribute or modify the Program subject to |
1698 | -these terms and conditions. You may not impose any further |
1699 | -restrictions on the recipients' exercise of the rights granted herein. |
1700 | -You are not responsible for enforcing compliance by third parties to |
1701 | -this License. |
1702 | - |
1703 | - 7. If, as a consequence of a court judgment or allegation of patent |
1704 | -infringement or for any other reason (not limited to patent issues), |
1705 | -conditions are imposed on you (whether by court order, agreement or |
1706 | -otherwise) that contradict the conditions of this License, they do not |
1707 | -excuse you from the conditions of this License. If you cannot |
1708 | -distribute so as to satisfy simultaneously your obligations under this |
1709 | -License and any other pertinent obligations, then as a consequence you |
1710 | -may not distribute the Program at all. For example, if a patent |
1711 | -license would not permit royalty-free redistribution of the Program by |
1712 | -all those who receive copies directly or indirectly through you, then |
1713 | -the only way you could satisfy both it and this License would be to |
1714 | -refrain entirely from distribution of the Program. |
1715 | - |
1716 | -If any portion of this section is held invalid or unenforceable under |
1717 | -any particular circumstance, the balance of the section is intended to |
1718 | -apply and the section as a whole is intended to apply in other |
1719 | -circumstances. |
1720 | - |
1721 | -It is not the purpose of this section to induce you to infringe any |
1722 | -patents or other property right claims or to contest validity of any |
1723 | -such claims; this section has the sole purpose of protecting the |
1724 | -integrity of the free software distribution system, which is |
1725 | -implemented by public license practices. Many people have made |
1726 | -generous contributions to the wide range of software distributed |
1727 | -through that system in reliance on consistent application of that |
1728 | -system; it is up to the author/donor to decide if he or she is willing |
1729 | -to distribute software through any other system and a licensee cannot |
1730 | -impose that choice. |
1731 | - |
1732 | -This section is intended to make thoroughly clear what is believed to |
1733 | -be a consequence of the rest of this License. |
1734 | - |
1735 | - 8. If the distribution and/or use of the Program is restricted in |
1736 | -certain countries either by patents or by copyrighted interfaces, the |
1737 | -original copyright holder who places the Program under this License |
1738 | -may add an explicit geographical distribution limitation excluding |
1739 | -those countries, so that distribution is permitted only in or among |
1740 | -countries not thus excluded. In such case, this License incorporates |
1741 | -the limitation as if written in the body of this License. |
1742 | - |
1743 | - 9. The Free Software Foundation may publish revised and/or new versions |
1744 | -of the General Public License from time to time. Such new versions will |
1745 | -be similar in spirit to the present version, but may differ in detail to |
1746 | -address new problems or concerns. |
1747 | - |
1748 | -Each version is given a distinguishing version number. If the Program |
1749 | -specifies a version number of this License which applies to it and "any |
1750 | -later version", you have the option of following the terms and conditions |
1751 | -either of that version or of any later version published by the Free |
1752 | -Software Foundation. If the Program does not specify a version number of |
1753 | -this License, you may choose any version ever published by the Free Software |
1754 | -Foundation. |
1755 | - |
1756 | - 10. If you wish to incorporate parts of the Program into other free |
1757 | -programs whose distribution conditions are different, write to the author |
1758 | -to ask for permission. For software which is copyrighted by the Free |
1759 | -Software Foundation, write to the Free Software Foundation; we sometimes |
1760 | -make exceptions for this. Our decision will be guided by the two goals |
1761 | -of preserving the free status of all derivatives of our free software and |
1762 | -of promoting the sharing and reuse of software generally. |
1763 | - |
1764 | - NO WARRANTY |
1765 | - |
1766 | - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY |
1767 | -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN |
1768 | -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES |
1769 | -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED |
1770 | -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
1771 | -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS |
1772 | -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE |
1773 | -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, |
1774 | -REPAIR OR CORRECTION. |
1775 | - |
1776 | - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING |
1777 | -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR |
1778 | -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, |
1779 | -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING |
1780 | -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED |
1781 | -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY |
1782 | -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER |
1783 | -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE |
1784 | -POSSIBILITY OF SUCH DAMAGES. |
1785 | - |
1786 | - END OF TERMS AND CONDITIONS |
1787 | - |
1788 | - How to Apply These Terms to Your New Programs |
1789 | - |
1790 | - If you develop a new program, and you want it to be of the greatest |
1791 | -possible use to the public, the best way to achieve this is to make it |
1792 | -free software which everyone can redistribute and change under these terms. |
1793 | - |
1794 | - To do so, attach the following notices to the program. It is safest |
1795 | -to attach them to the start of each source file to most effectively |
1796 | -convey the exclusion of warranty; and each file should have at least |
1797 | -the "copyright" line and a pointer to where the full notice is found. |
1798 | - |
1799 | - <one line to give the program's name and a brief idea of what it does.> |
1800 | - Copyright (C) <year> <name of author> |
1801 | - |
1802 | - This program is free software; you can redistribute it and/or modify |
1803 | - it under the terms of the GNU General Public License as published by |
1804 | - the Free Software Foundation; either version 2 of the License, or |
1805 | - (at your option) any later version. |
1806 | - |
1807 | - This program is distributed in the hope that it will be useful, |
1808 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
1809 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1810 | - GNU General Public License for more details. |
1811 | - |
1812 | - You should have received a copy of the GNU General Public License |
1813 | - along with this program; if not, write to the Free Software |
1814 | - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
1815 | - |
1816 | - |
1817 | -Also add information on how to contact you by electronic and paper mail. |
1818 | - |
1819 | -If the program is interactive, make it output a short notice like this |
1820 | -when it starts in an interactive mode: |
1821 | - |
1822 | - Gnomovision version 69, Copyright (C) year name of author |
1823 | - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. |
1824 | - This is free software, and you are welcome to redistribute it |
1825 | - under certain conditions; type `show c' for details. |
1826 | - |
1827 | -The hypothetical commands `show w' and `show c' should show the appropriate |
1828 | -parts of the General Public License. Of course, the commands you use may |
1829 | -be called something other than `show w' and `show c'; they could even be |
1830 | -mouse-clicks or menu items--whatever suits your program. |
1831 | - |
1832 | -You should also get your employer (if you work as a programmer) or your |
1833 | -school, if any, to sign a "copyright disclaimer" for the program, if |
1834 | -necessary. Here is a sample; alter the names: |
1835 | - |
1836 | - Yoyodyne, Inc., hereby disclaims all copyright interest in the program |
1837 | - `Gnomovision' (which makes passes at compilers) written by James Hacker. |
1838 | - |
1839 | - <signature of Ty Coon>, 1 April 1989 |
1840 | - Ty Coon, President of Vice |
1841 | - |
1842 | -This General Public License does not permit incorporating your program into |
1843 | -proprietary programs. If your program is a subroutine library, you may |
1844 | -consider it more useful to permit linking proprietary applications with the |
1845 | -library. If this is what you want to do, use the GNU Library General |
1846 | -Public License instead of this License. |
1847 | 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 |
1848 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/default.css 2008-02-21 12:27:18.000000000 +0100 |
1849 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/default.css 1970-01-01 01:00:00.000000000 +0100 |
1850 | @@ -1,61 +0,0 @@ |
1851 | -body { |
1852 | - scrollbar-face-color: #F5F5F5; |
1853 | - scrollbar-highlight-color: #F5F5F5; |
1854 | - scrollbar-3dlight-color: #B9B8C5; |
1855 | - scrollbar-darkshadow-color: #FFFFFF; |
1856 | - scrollbar-shadow-color: #B9B8C5; |
1857 | - scrollbar-arrow-color: #FF3300; |
1858 | - scrollbar-track-color: #FFFFFF; |
1859 | -} |
1860 | -body, table { |
1861 | - font-family: Arial, Helvetica, sans-serif; |
1862 | - background: #FFFFFF; |
1863 | - font-size: 12; |
1864 | - color:#000066; |
1865 | - font-weight: normal; |
1866 | - margin-bottom: 0; |
1867 | - margin-left: 0; |
1868 | - margin-right: 0; |
1869 | - margin-top: 0; |
1870 | -} |
1871 | -hr { |
1872 | - color: #B9B8C5; |
1873 | -} |
1874 | -a { |
1875 | - color:#000066; |
1876 | - text-decoration:underline; |
1877 | - font-weight:bold; |
1878 | -} |
1879 | -a:visited { |
1880 | - color:#000066; |
1881 | - text-decoration:underline; |
1882 | - font-weight:bold; |
1883 | -} |
1884 | -a:active { |
1885 | - color:#000066; |
1886 | - text-decoration:underline; |
1887 | - font-weight:bold; |
1888 | -} |
1889 | -a:hover { |
1890 | - color:#FF3300; |
1891 | - text-decoration:none; |
1892 | - font-weight:bold; |
1893 | -} |
1894 | -span.orange_title { |
1895 | - font-family: Arial, Helvetica, sans-serif; |
1896 | - font-size: 12; |
1897 | - color:#FF3300; |
1898 | - font-weight: bold; |
1899 | - font-style: normal; |
1900 | -} |
1901 | -td.content { |
1902 | - margin-left: 10px; |
1903 | - margin-right: 10px; |
1904 | -} |
1905 | -span.copyright { |
1906 | - font-family: Verdana, Arial, Helvetica, sans-serif; |
1907 | - font-size: 10; |
1908 | - color: #A59EC0; |
1909 | - font-weight: normal; |
1910 | - font-style: normal; |
1911 | -} |
1912 | \ Pas de fin de ligne à la fin du fichier. |
1913 | 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 |
1914 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/ejabberd_banner.jpg 2008-02-21 12:27:18.000000000 +0100 |
1915 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/ejabberd_banner.jpg 1970-01-01 01:00:00.000000000 +0100 |
1916 | @@ -1,43 +0,0 @@ |
1917 | -ÿØÿà JFIF d d ÿì Ducky F ÿî Adobe dÀ ÿÛ |
1918 | - |
1919 | - |
1920 | - |
1921 | - |
1922 | |
1923 | |
1924 | - |
1925 | -ÿÀ UX ÿÄ Ó |
1926 | - |
1927 | !1AÓÔQa"UÕVq¡ÁÑB³u6±2brÒ#3CS$t´ERs£T%²c¤F'ñ4 |
1928 | - |
1929 | - !1QRÒA¡ÑSÓaq±"á2Br¢²34ðÁ#sbC$ñâ³Ã%5&ÿÚ ? ÷=N¬û/>Ñ?<ȳ^<Dz·°Òf}TÁºß.«¸gñË8±¼?t÷èëÇ |
1930 | -ðQø°èëÇ |
1931 | -ðQø°èëÇ |
1932 | -ðQø°èëÇ |
1933 | -ðQø°èëÇ |
1934 | -ðQø°Ã§\¾8Wc§§Ü8_c´ísxá~ ,rÒy¨àpîbþ°¿Ç9i%F¨·9Y_cÎd4Fl]%ýe~ ,G9Tµuõ¥ø&8±ÌöMQ¦ì/ëKðQø±ÌöMPí-U¥øüXHÉ«¼2)˼µV×àcñb=+,WXd"S÷j¯ÀÇâÇ:YWHd"T»ÈµWàcñB=4ÎB%N½Uq~7#ÓH¸ÓÈDªìZ««ð¸¡ÎEáK'´ U[ÜEu~7"ïÊZ·u,Ò%VoÕ^_Åþ¦yIÙG'+!Uvû-Uõø¼P¼Ï)bÝtrr²\7éj¯¯ÅâU<¥«tÐÉÊÈUr_åªà_7Åþ®yKè¡£ÊùÈUtf äæñxÖTÊX·5ßGóªìÌ2/´+æñ8ÖTÊX·%ÛGóªðÌRÕp¯DâD[S)jÜwmWÎB«Ó1Ë.%óhHëªe&· |
1935 | ÛGó.øÌ¢Õq¯DâD_W)jø~ë£ÊùÈW~fYäkæÐø«ØX¾ºhò¾rfg}¤_5Äø \¾ÂÅðåÓG\ä*ÌLÐ"ûJ¾k{Æ®_ajøjç£Ë.ræFh«|Ö ÷l¾ÂÅðÍÏC\åù©±Y'r¨Ôg¬?¸ÏzVK"4ÑøRå9YË.sé7<äÿ ´Ä|^¾^DoòmÃEëKùé7<å>iñzùyòmÃGïKùé7|æ>i¯òuÃCïKzaÍß9ÕÍ!qâõòò!äëÞ9óÓoyЮi¯òuÃCïKùé7¼é_4ÑÇ<Z¾"æOÝúz\ãÒþoùÔ¾i£WÒä\Ç|»ô>ô¶³Î·9-_Ks'îþ¯ïKhùéw8<ìsÀèáâÕô¹1ß'îþ¯ïKhùéw8<ìsÓú0çWÒä\ÃÊ¿«ûÓÚ3Î×y?£^4¹1ß(nþ¯ïOhùés8|îwÓú0xµãKs(nþ¯ïOhz[Î;ætþ-xÒä\ÃÊ;¿«ûÓÚ>z[Î/;Þætî+xÒä\Ç|£»ºµ=¡ék8¼ð{Óº(xãKs(îî©kOhzZÎ/<ætî+xÒä\ÃÊ;»ªZÓڳϹ;¢Þ4¹0òîê´ö¥¬âóÁîgNè¡â·.EÌ<£»º¥=¡ék8¼ð{Óº(xãKs(îî©kOhzZÎ/<ætî+xÒä\ÃÊ;»ªZÓڳϹ;¢Þ4¹0òîê´ö¥¬âóÁîgNè¡â·.EÌ<£»º¥=¡ék8¼ð{Óº(xãKs(îî©kOhzZÎ/<ætî+xÒä\ÃÊ;»ªZÓڳϹ;¢Þ4¹0òîê´ö¥¬âóÁîgNè¡â·.EÌ<£»º¥=¡ék8¼ð{Óº(xãKs(îî©kOhzZÎ/<ætî+xÒä\ÃÊ;»ªZÓڳϹ;¢Þ4¹0òîê´ö¥¬âóÁîgNè¡â·.EÌ<£»º¥=¡ék8¼ð{Óº(xãKs(îî©kOhäY»X»Ýæ4Î-xÒä\Ç<¡»º¿½=¢K9ó¢EÈnîZN$¨Ü03ÃdR÷¼%nw"æá |
1936 | ÝoåýéíéÛõp»A§r |
1937 | 9:ñÇÝD!¾/úÜÑWàÍÝ,§ýSÚ2³Ï¹;¢|Vñ¥È¹<£»º¥=¡ék8¼ð{Óº(xãKs(îî©kOhzZÎ/<ætî+xÒä\ÃÊ;»ªZÓÚ%YÅÔºwAÊJOaøP7Ú3n:í(£½«§\®§Áû¾JÅNÏT¥üäw¾Sç;ãÊ ×#·NºZA¸Ú3äòIwÊkxÌÒ¤ë4$g§£¸ïÞ0<?1ß¿ÔÝþü^u7ý|çbRI=9óÒâä:F£×VdEÜ"±ò&T q1èà¡ÂHÄKÔѵ"êe C B,±,A¢ëe¨zÄYj Y2äWX-DÖ"ËQY[El½Ö"Zî.Yf ËYf"Ë]g A"ºõ2äVY2ôUYèe¨®á²è1]³âWpÄtJî-î4[13?hg«ônÞ0£1ê |
1938 | Eè"Ö`|Ý2)\,¾+}ùû.IºÇnƵF¥öÖ{¾áb ê#íâEU\Õ5æØi%³AýÑG¿Z=¨/øs¥dº*§"¸k <TÔ]FpÃ¥gz¹ ºe§ôñR®Îá~î"])¬h¼ÅÏOsCÉ[Ù2Þ/lÑÌü¨Ê±&<¤ïGu.àûBÅiÐ §VNý6J{ä¼#,Lá·T|¡IئÛ#!E,fúøalcI 5dºìköÔfÛßKBhÔZø7CK/ø£I÷ 5^eGÏ|CJ3¸UµbµÓ¥êüKß8¡ú!üÚd $Ô8I¨D"Páb"Xb!X,D+1ÄB¡ÆXbµÕ´@µ«Xã-Eu2ä@±ÔWYëe¨®B¹Öb%Ȭ³eÈ®³Ö ËYÁ]» Ë¢VpAD¬³e謳e¨¬³Òb¹1_»¤@º%wH.YÃÒ+e±0u³ÒÑvÞêÓ19é 3"#3<´¢ `§ÜÑ3jyCÅ£{Sd~ÎÑ[EN§ÂaVåb²½Õ)jAþ²ÝA{8{â§'"J;[YzCGi=ñûÄ$©·µ(G´Ê3A§5÷ÈSøGÜÀMSDºGÁ¶0&;z5b?º%²rlhµ6öC¶µ:Ë2 m$~ðXs!rÂïI~.)û.|¬ Eûr*ÿ B³AöD¢÷0t5ZÜi3" 6"¸Vq=Ý$¶ñøEn2G:sô2XµéñL-<¡¢Ñ¼z.îÞèjå+ÃÒB$ôoG^*/¾mZ^ÉÓL2ÐéÐ |
1939 | -õƯîÿ )<G#nïEýÚ½áÒ7Ôü¤lãQ 1gý·µ~¹§4ØÛqüø}¥í<=ûû |
1940 | -ßãágµiz¥÷Î(~4 µræ |
1941 | gÉbËVj*J |
1942 | ÖZq.)JlÓ½Þ%X$e¤c¯}£A¥RV6{{¿qßoñs»ÓsQv6¬Çò´bÙ\¤ç%¬OhÒ(ñK®7? 7ªÿ b|çßL_ç</¯Éºé£TÞ½DÎçNV´õÜñµ`gí%czÝW×Dãðö±P"ö²ÏL¨#I¹YïI/ÌÉÖ£À±üÖìè!ºi®'Ì[äíïÔ>8íù)*"RL,HËIõO²ÃI"5DJdÑ |
1943 | -µ"%k,D*-D+=b,±(E¢ºQX-D |
1944 | -1Zë.Ew@.]f ËQÄYf ËYf ËYÃeñ+¸b¶%wAĬáèeȬ³e¨¬³Ö"ËYÍb¶_²ÏHr+¬ô.Eu±\gI¶~ϼ3Õ=¦6bFsÒ |
1945 | -ÓgƧ³ÃIVé|T(ûCØFRHÔåÔ*·xÉHgÞ0¿±CxÓð¼ËS¶"rg|¯Ù$ôwOà<¦ÔpDζÚI!¤ZÀ ÅmÚr VU:,²>8¬N w{"e°«(â5É´0O´£Á'^o2ö{û!WÐÌ 6½¼iQÁjKú¯Æì²5-Æe%Î ^yáQÿ Ò_ü¦8ñx¸_½iµ{Ã5?¤nå#g@ ?í½«õÍ;ù¦ÆÛçÃí/iáïßØVÿ ÿ =«KÕ+ø¾qCôcù È <ÉàV3¢Å¢OG |
1946 | b`11Tæ$ÔÚy&F[żX¤ñ!ñâ1ö%æÛêr?nø2J÷ZÉG¤qê$ñ<1ÿ çÜ¡ówþöH×Üô>ô¹Ïó¾ùë¾å=ô|Ë(%ô=Æ åSYã¬ÞÄ[ÕvJÅYsgñnô¶UpýlÚÊî3Mq´cê&ÍIcìâkwPX£Ë.s<¾$Þv¹§ýöNÏü¯µ-ûV5fܧ7g,Ýÿ ó«qëÝüâ×ýq?¾w}*T¡¸qägèßüE|½^åJñ78æ`VEXó¢¸Êwý»özüoHú?Röß¿sSíËÚËêÖ-2"%DJeÒóFüc,¬zï&õQ_'ßÉ/9Êdµ½3#.÷ Þ>ÑîÔz Ùo5¤±Zm*Ú1""Z*ê¿¡Ú÷U¡j¿ |
1947 | É.ùãF $ÁÃ`Q¬IïàX |
1948 | ®î¥9Í?¡g)×;YMZ#J V¡Z31/¨}D[ÉHRR¢\Ç82Q¶$ôÓu»:óqNÌ |
1949 | ñ |
1950 | -:5i²,ÆZ+¸{tJî-]f"ËYf ËYÃ/EuëeÈ®³Ò ËQYÃeñ15º(ôõgn7;ÒÚLJK5ÓÀN7R¤`¾³KíIôprU7ÄcÊëW5½M¸XiL3SܦÙY© u$¢#2Ñb;z èU6íqmqºÖU©ÆiY.,cfÔVYée讣Ö"Ë]f ËYB²äa«î´{1V>ࢦ#}ÕûÆ g=0 J¤Í69ºç|áèiª?q»JV£1ç×eÏñöu! ìÏL)}il*|x |
1951 | î2Veß8zÏà!|b9I²Ð Ddde# `êT¨ôTèÖ¶½ôü<éð£e:Ê^ìøÊ´ª²â(¢Ë3TcÐI£´} NUVÙÈËÒG¨Æ ¥W^å2R¿dB2ÄEâ1ÚOR¶f]Ó2ø±ªþ\Mi1 f,ÿ ¶ö¯×4ïæn?´½§¿a[üsü,ö/T¯â^ùÅÑæ ó6q©'ë`¤èä¢-ô£Ç§¸cãwÿ aKú??løUùËçþ·þ¯Ù×`dÝ9פå·"f÷ ¦DG6Gñ¡¼RDıRÔìÇ÷·k¥JîÈ#ñ3©ío^¸jÒê |
1952 | Umä>çÌúòB#<n.;î©íÅ;©Ú¬ú¢´UªÉzéÜmæÐëKK8Z%%IQbFFZ£õm×ìxqÛÀõI |
1953 | ¸³ø©TIDFE·NÀߺ «ùHýàI(ßå'ÁNß¿²-ô© |
1954 | -RF¦rRL°22i8õèþ\}HøËëNñQ9{Y¾¯z^Û®{Õ¢sCm0 |
1955 | é2d:{0Ãe¥n¸£ÝJ{¦dDf5Ñ£*²Í3) ǨzÃ]m&|H6õL|·ULÕY)Öu1ÝÃf¢ÖZÍ:±Ä§´07)¿E_ÍV*uOXË=T¤Sëú·¤B¤"U°hÖ¥4ÝËÇb+f&zÖ£²ÙAúlkù2xQ½³á2M9«JCrl(jQdøHî=1¸ò}¤¬. |
1956 | FX2£qÿ ÑTÈñzDÜ°Z0sMËj¹O±:3>bUT¨´Ü(ñãCJ*l ¦±#$÷¦kQn²n÷\øºy°\9^D¸YkÅÆ}ë-%úý¥MJzdùÜûÙQöÉ´ûNWE6oÓj\J~D̬äͧ¶*R/{~¹.4¤P.!¾ý,æëC2â¾dó;ÄJÝW¤èÇhÕv¹P¼Í*r~ËSÄĪJ |
1957 | -1YÙy*_ÈëÎl'ªÉ¯ýÏ?*e=6ÓI3øî8W |
1958 | -ð¯M;1ay'RV8³}j×IS¸©6Q/¾nM§ý2ûiVKÒäºÛjZu+gw°{Gçt§FU=-æñ$½¬ÒGÂ)«=ÖW+.M§æ*Mê =¸_CÖÊt©Q·]eÕ%=öâV¤é×Ø+wc¥'Û þä0ý%ÄÍG?¯* |
1959 | ÃtKÞù¿@V¤ÏmÒ.ünF+I¤ðZ |
1960 | *J±Dd4î˼éÞåNKÞÍä9x%%Ôl°%ç%÷º¼WàX4i'©ñdD:µel,±B¤iT¤+"Y§R)ÆëAæ´êÉcÃoÕVxU\lù2ôÕ6sRîão®R§)ÇRE¡©1RR³ÃðqÖxjT¹ÔÁ(J¥K;5ìe¹µâRRô5g)b¶´ûuóSSxÔw]§Ê,eCD ÆRS÷Ë5w¾ûxµj**îê±®©GÞrñ4øKéÞ é¹¼cô<%¾rÝMú]2gÒ-èÍÖÉú TÐzR§¶Zd̾"ZhéÜèà¥R_é±GÚß%W© %éÂÊÓÏ:G1-P.ØÍb·`ÆDDå§i4·Éã`#q¨ì¶tÞWdË2Ûo0ÃîÏÑ ?æ%שs'«Yg·ÀÕ©O3M:¤Ñðe¶XyÛ%$÷1,Øö·}Õÿ 64*ý&í |
1961 | -Ím5Ärÿ þ4ªÓÇ>jV2*MùÚê |
1962 | Ô5)+7¾·¥¥'¸ÌXæ£Zð?l5®W[£Í¯)J|1 /\1m+Í{¶TcVáõ$d®ÖµjÆ£[fÃW&cÖ Â"NSKff¹Ôá´Ëi2Ç3QêÛ::uÜêZéÑ6ð¿RÅk|ÊÒQ õ%À°/[È]6þlMIH¨^pi¯«IæRRó=¤NJuKW³º^.QÁRË)Øø¢¬-Ü°º> vj×Õc0mb®¥1n;rT9W¦°¸s"¹!¥6 ¿Ku |
1963 | -kyI#SkÅ:Ìm¸ÑºÞkC¢¶ÔͶ2±âR±;}k ÷VñBºK'α«W |
1964 | -ÃÔlÙXúÒÕú²/Íò7¿ï*ý·í=m×ûZeBÌyõÑYG¬VËÑYg E"ºÏ@.Euäbª¥e±E°dd)©×AÙ4aFcÖ d¶ Ç\#Qm3ØEì7a;¦ Órë³øWu¨ôe/gvÉ¥OëÈÜ"Åj)eÁ%¬ööL_')92a" ¬RÒ´ªS ﵺÛøEï*C (Öú²ÄED¨P$+½?Ð,ö~ ûÁN|®µ,Çè3âó9¸Üܦ);]ZQîãïOAn7o9°÷R]ÌLÅt3mãW ÎÌ ?í½«õÍ;ù¦ÆÛçÃí/iáïßØVÿ ÿ =«KÕ+ø¾qCôcù È <¹J½clòI¢¥D[à}Ã!ñ;Åÿ ò4ýpüGî |
1965 | &¾¼ýßøÍ3×%®kèÙ·Du¹ª0¡V¡:êZqYyÇRûDá,Þ4© =ìH°%bx~µº/qö6ð ^·ý\3¼ëJvÙD¥-)yêÍs |
1966 | -dX^Â-ÙHñÁ¥v·;õýk^E ;'6}a+uÍkÛ¹3zLzeP©ôÙtݦTf@%%o&;»í-&FIá7{ì0#4¥&1Ý®Qe*±VÍ·éV=cMºªÇv}éSÓçÈá'DI!N°r %%k"qg¡'¬|ýº¨7 FK|çÖ|3xèo2x_z/ØôaFÔfÌͶPÒj<Td",Oiè¥b°ùÍÎNOvxõ®jsQòÚ¶UEÑht«²µ*ÊjISÜun<ŶúÙ¥¥éZp#QmÀ{;±«j+-n.Å*8ͬ²ó6ÏRZDiQQ(&FG¤¢¿¨£Õ-isIå"{/óUóùÏQmÒkqÅÑ()JRÄÌÌâ`DE¬Ç?QEÿ ´µ¥ÎM'èK¶Ý¶hþ®=bÓ¹¤]TËìWz¨ü?£Û\ÅÔcµ Ùhi¶ô)´nlNµ*î1s\`ÕÛÇaƽӵ-WZ£zÏæ$:æ |
1967 | Ϲi4Y¢ÜÑÂAÂÙÛF{IîýH-8:Yg\©¸âwâä.Ógv¨x¦¤tovHÉ%eÖùEY |
1968 | C¥ÅQô®·h-¼$Ü3ØI¶è§9^bãÁ úWiAÚhÙ^£[UWªÝ}ijårÜиXQCª= )+3ÙÕs§*¼F8ß;i86zTÖ¤ ¢#Jñ##ÔdcæYé#V©À£ÓåUª¥È%ÓÝCm4R£ìä`ç%«[,µ%k<iXB©^ªtÊ¥J"¥K¹VOY`i§?=Ç[F££¾OiC쩼íââ-ôæ[ÁwMâ¶ßÓ×Tʵ:»MX¤HDºdæ"$ymÂÅ&F>&¤% 8ÉXÑïBJJÕÃ"ÄÏA³³B<_wðõzuç}Q¤.5wõ&K&Lrj{k&Z´©#qµ)4¨Ëhû«½:RVÏ¡³ GÑÓÀ©l¦¾zäÆøÎønÎÌ),·&>kMz;ÉK¼Ý*¤-,R¤©1ð22<HÈ|¼¯Wtìt¿j|ç¹5^UñGvNc&y¡?ÖgI¤ta_êîÝB×9j¡[z±æ:Ró¢Pâd®gWè#×:«5(_HÏr*a²sbÔKªhm¶ÖJ5iq¢4(ËAúj¿Pà©æÆV+mÀâì·#ÂyuéÁ]jÊ2ÏÎj×eTñô>ZE:%. |
1969 | - ¨pYn4vËA%¶RHIwÃU¨ç''»O§¨¬HêÍÑ}`aM«½n2)Í |
1970 | Æ%ðÎ0=ÊI³ÑíÁ:±ÆáS:KÐãbgÚ ý9b,^»m°ìõù¶}4LÙ¬Ò¨¹{qH«-)fDmG¥×ä4¦Ûm%´ÍGÜ-;¥ºhÎî5$ýI;[1o°§vZùZ ÊÓÿ Ö¶§Õ~l7¿ï*ý¹{K÷Wíiýlî±ã³×Yg @½ÖzYr+¸b¶]³,º% éÞ²×câé÷ rÄ_c´Á±öO ÓêóUQÙÓÝAÆ^£?Q9[ 8ôô#d¦ÁDäÙçU¸®ßc¸,lEÓ¯Ð\ ViüÂ}¢ÁF}e©¨ßFjqÍf^;Æüáþð×zço°®è¾ÎF9ÁÅØc.q8±YQ{!Uà#lÒ2F¸8$®(Õíh÷i/t¾ðýÿ QÀ 3Û{WëwóM·ÏÚ^ÓÃß¿°þ9þ{VªWñ/|âèÇóA yC3K²¶ú-O¡¡XöM棸¢ |
1971 | vï(záíGïů+<°¯ødSO¦Óê±ù%R#3bï¶ï%´<ßÊÉÆ׺²2ÞBÒJIì2#!÷qXQø®fZÙ¥A;rö¦¦£O%ðÌ+yM<ÃÄFDãN ÉIVÙÀËA¶ yÑtrêÔêÝ«A:«L=®Ð«R¤@^$¢aèl4âÞ;ÄJ3ßÃtÔcØ[â£R±;05姶à7I¦²Ü |
1972 | -E!æVÄ(é&ÚKQP¢i´%8$ºxv|åhº6øm6ݯ~2ªÛ-ä´Ë(HÌ]nH¸éRèuèLÔi6eÂq§{íé#ØzKHì'(IJ.Æ[$ªËIypÛThHxâV¡Gl´qÓRaçAlOd7;êã'_Ëc$NÍU?JÙZ¸èæxÈ¥H~ú¤ÒûPkN¹Ó ó7ò©Æ/.>[I(åfËVú¢Ñ²/+U«J¨S¹Lz6ã°hôº{éun¾¶qi¢A6IKxï:V:.p):õmJÇÈvXp#¸¯¬¼µ3 |
1973 | -x·$3\.pôÊg|'ô CFV$FxbF<ÑvÅãƸT±¢ûþ"y%37+íÓ5s!ÒgJ$.TìMüpÔg¤µ÷Iát£o®IqZIAå1_W+VµJ«µ^«Õ+×EZ"àÍZ}3eDiÓ#YDhÛáæÛ#À̱ÒbQÞu!%b¹«~¾K¡MaÆf®\£¡]2lµÕÝ90¬æße0^i·YÜ©¤¼bXn§-;ìé©æãK¥îðfrf]ºDÆ^_5Ûb> |
1974 | -¥F«@apK |
1975 | ÔyMc¨Ã´,ýOóiÆo.¿5¢J_FMr»Ñ믲öcÝ{ÕN¦9LC¤©Äòä8M2 |
1976 | '«5'´!âûP?JµËÚZ¨g}&åì3y`ÓïÛ~-»!õ@dIÍðIîK%¥½ÓÐI<0.·©PV¶ã4T¤ªFÃYw& Ò¥È× |
1977 | VËT |
1978 | ÷©ôÕ²ý(ÝQâ¥)MºÚLÿ éîh_â.I*±K8_ÒÖV>3ªì7V."´¼¤©×Û8·Í÷[¯ÒÔx=KgÒb¾ÞoZZÒ{K,DVð<4©F.5êÎl³ôÎX'6ÖL^ÃrjÝ Ä¡&ØMݼ)S ¤ònDd¤°2<Ouíd«MϤmç[m¼&øÓm2YFí ¸ï¬ÛTò36©D¶*TöIZɦ§4é ´àKÃ|·©µ8ÍåÃò¸´S£åÎQY1®RYYR¶¨÷ñ[®S×Þ½NdãR¢¼Ðhu0YmkIí-ò[Æ4ðÒ¥<¸d׫9¿aoèÜðNrÉ{zï˪%Ë`IËȸQ¨¯!(m¤F}·ÈѤÛÓìã¬f»_êQ¼*ïß|6¦U®©EÒ^êôz¦Ò½F<¶zh×î{b wR×G¸a¢d(JTf¶â~õm&JBË |
1979 | -I®÷yçÓv?ãSnðÙ«Q§ÿ °.xäô\Á¬1´%©A©8ØDì |
1980 | xmF}±¹ï |
1981 | -3Ã:oÐåDì(ʬpB´ôæË«JNe%_(_©Ô. |
1982 | -˱ß}QÔº¡ *;Km!ZqÇsØçTcN6¦ÔUÖi<-ñ[®µÎR¬i9p[b6KvÕµoÓmöSìÓ#7,´´IhÄðUVU±É·Æz×Z*(ÓNÜÕaqÃÖ13tJîj.]Á]³ Ë¢WpÄtJÎé#!\yiÜQ£û&iöµ{+XOR¶(â8Z ºôãÐÙàûø¶ÉÓödìEsx,ÊQ·iä_½,´#B;jì÷TÕ¸M-fEE¼¨ CÂØsïVXcØ=ÜjÕaÔÚv£Yòé³ÿ 9 |Åø=|e;¢U!êΪ»(kÓÜ×îÔv³5Ú6ÎÖmqÚàXi¯ì$ý¾èÒ©;[d¤@ 3Û{WëwóM·ÏÚ^ÓÃß¿°þ9þ{VªWñ/|âèÇóA yÏ7²Vü¹o§/Z[.%Ô°¦oi]Ú[Õ¥IßJDdgÚÄþGynªõkô´Úàᱫ?OØþø·wÝ. |
1983 | -ëyVg[îçFjM¼+ÔìjÌ\F¶Íë:Á"P=í{õsWc}ãÀcW=æ¾´µþsÙúøVXéñ³ÙÃVo*ßERY¬Seeí)Ã!5uÞë=dU-ëð¤{)/b$rÚõ©B |
1984 | I!Ó/ÐÈÏå-%îº×+Öïïè1±íßXÞôg/9µ&-òxÞ²öM,¶§ÚÐÓ«-× ûÝ¢Û¥ |
1985 | áÓÇ¥rQ·¼±ðâ1ï÷îáU]#MÕ²ÈûOJÔå)·ôj×¢%"5F¹tÙvèÔX÷umnÑZ¨0(mÃ, |
1986 | DËIh1e:Ó§ô¹ Ø5Þ [q>·iPé1ÇÓãµuc¸ÒRpWR¤¦ímúK"¬.,RZT"Ë]F"˶¢±Z"ËQ]f Zë="Ë]B¹Öb%¨®³eȬ³²ôVpÄYtJî2èÜ1èzA"²ÌA¢²ÏX.EgAĬæ±è׬A"ºÏI2äVYéeÈ®½b¹YÝ|Ïbé |
1987 | -&´%Åf° Ôª¯ú©¶-±H"Ú{}Ñ£µ1ί6Ì&; |
1988 | ²Xlö¶/JÅa)J×i(é ×ëñ·nRK½p·øÅ«Û!ªá6]§5)18iÈ=dázô'OºbºjÙ+ES³ÚÆÃË 3Û{WëwóM·ÏÚ^ÓÃß¿°þ9þ{V/ʽ7Tê{iqF¢2öð£Í@ ÀÇ "5Dj&8Ë |
1989 | -µ"%k,D |
1990 | -,D+eBµ(D¹(ô²Ô@¡Zë1ÔWsP.]b¹Ö"ËQYf ËÑ]ÃeÑ+,ÄYr+¸zDtJÎ]³ ËYbµ¨@½zDr+¯Y"²ÌA"ºr+¬õ2äWY2äc§£oAãðû¹EØí1úIjØ)= )/xξ«A«ºE ÉØfÞN¯Nî.+Ùÿ äÆxáu5OÖmcAX êr ¾ù%¾e:D&D¢ìvªÄRÙþ±n)Ó÷4qïNØ&l#Iç VYÑ&W³ß |
1991 | ¢1¥w± |
1992 | ĺf£Ù »fCÓÝ´ëÆÎoòßÞáBáS9áq^¹+>sÙ2øó{ýW÷ý¼6aìÐçPËÃô6o ±÷ å»+ö òòÀ |
1993 | Ù_´/_ nÊý¡|ü° Ó+ö òòÀ |
1994 | 2¿h_ ¿,pÁIé?Ã/Ë&Í2?kþ~X%i÷íÂ.0q+HÔtâñø$ñ «H4âñø$ñ8 §/ãþJB¿n¯4Gbrȸþb6x~^<hÄçqüÄ*l°Ó!~<p°±9ä\1 |
1995 | -Fý<xátµ9ä\1 |
1996 | -oüËÝxãQ,N¦EÇó©¦Í;ÍÇ5¯øùK©q½µl·¹²:@Êø¾räêäZÏdmEÛ-îj"Ô2¾/±J®Hë=³lÇù«}$A¨e|_9jmë=³Oï¯óFúHPÊø¾rÕ*Ú1Ö{%u³OÛ:G3o¥µ¯ç-R¯£g°W[ïóòy](BÈe|_9r}ë=±KÛ>W2k¥µO+âùËT¯1Ö{IÇMB_1k¥5O+âùËT¯:0×{uÇ£í¨Ëæ-tÁ©å|_÷)Þta®ö |
1997 | -ëEÛRÌé-SÊøÑbëBï`q¨zq©Mêözh ²¾%´Z§zлîÊëAÛSÕìôá©ez«hµN÷¡ |
1998 | ywd |
1999 | -o㦩;«éÂ4²ËUm)Þô!¯.쮨¶îõYýZÇOÍ¥Z«hµNù¡Ò]Ù¢Û~6¨uc<EƵVÑj©|ЧÚK» T[gmZ¡Õy@C6µVÑj©}êéöî×ÛW¨õ\(¸ÑÒªÚ.U/½]>Ò]Ñ¢Z»k.«å:RÕ[E¥û«§ÚKº+=ÒÜ=êÍOª£ùDEƵVÑj©~êéöîbaY¸hÕwq=ßôÚºÌRãwÒªÛ5Ó©¼3.k.äûȬßÕ:¢7Ã6µVÙgK¼:º]¬»È¬ßÕ:¢7Ã6µVØéwWKµr9㺧TFòfÐÒªÛ.ðêév²îG"³|wTêÞSÚRÕ[c¥Þ].Ö]ÈäVoêQÊaCJZ«lt»Ã«¥Ú˹ÍñÝSª#yL3hiKUmxut»Yw#Y¾;ªuDo)m |
2000 | )j±Òï®k.är+7ÇuN¨å0Í¡¥-U¶:]áÕÒíeÜ+0¬³¦¼K®Õß{¾h£ÅQá`êû¢2ÞÏ¥-U¶Bu7 OµrU¡A±à+µe+ûê4TèǵUP®nø}éj³LêïÕýª]¬»3ȬßÕ:¢7ÅÙ´4¥ª¶Êz]áÕÒíeÜEføî©Õ¼¦´4¥ª¶ÇK¼:º]¬»È¬ßÕ:¢7Ã6µVØéwWKµr9㺧TFòfÐÒªÛ.ðêév²îG"³|wTêÞSÚRÕ[c¥Þ].Ö]ÈäVoêQÊaCJZ«lt»Ã«¥Ú˹ÍñÝSª#yL3hiKUmxut»Yw#Y¾;ªuDo)m |
2001 | )j±Òï®k.är+7ÇuN¨å0Í¡¥-U¶:]áÕÒíeÜEføî©Õ¼¦´4¥ª¶ÇK¼:º]¬»È¬ßÕ:¢7Ã6µVØéwWKµr9㺧TFòfÐÒªÛ.ðêév²îG"³|wTêÞSÚRÕ[c¥Þ].Ö]ÈäVoêQÊaCJZ«lt»Ã«¥Ú˹ÍñÝSª#yL3hiKUmxut»Yw#Y¾;ªuDo)m |
2002 | )j±Òï®k.är+7ÇuN¨å0Í¡¥-U¶:]áÕÒíeÜEføî©Õ¼¦´4¥ª¶ÇK¼:º]¬»È¬ßÕ:¢7Ã6µVØéwWKµr|8vféïVê¸?éµufÐÒªÛ.ðêév²îMjÄåzýdÕ¼{¤ª,R-Ü?KÎÐËÝó°JZlÛ*»Ç¢ÃJk>äٹ㺧TFòÕCJZ«lÅÒï®k.är+7ÇuN¨å0Í¡¥-U¶:]áÕÒíeÜEføî©Õ¼¦´4¥ª¶ÇK¼:º]¬»È¬ßÕ:¢7Ã6µVØéwWKµrsj%rk#ïÐÕ.+k2í)U|nöáµVÑ]JÉÇݧI?òMÿ í/ié\ôuô+¿ì]îQÞý)Ë0úC{Nï |
2003 | 5îð}æ¼4â>Çw~3û_._ø°ü[â_éÿ æMCú¸OÿÙ |
2004 | \ Pas de fin de ligne à la fin du fichier. |
2005 | 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 |
2006 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/icon_p1.ico 2008-02-21 12:27:18.000000000 +0100 |
2007 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/icon_p1.ico 1970-01-01 01:00:00.000000000 +0100 |
2008 | @@ -1,15 +0,0 @@ |
2009 | - 00 ¨% ( 0 ` ÿÿÿ ÿÿÿ ÿÿÿ |
2010 | - |
2011 | -ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ |
2012 | - ÿÿÿ ÿÿÿ #')*,./000000000000000000001356786- |
2013 | ÿÿÿ ÿÿÿ $2;>@ABCDDDDDDDDDDDDDDDDDDDDDEGHII<T"³iT) ÿÿÿ ÿÿÿ !HB$Á%È¥$Ǧ$Ǧ'Ù¼(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ(çÓ*ôé+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ"´2 ÿÿÿ ÿÿÿ 'Þ+úó+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ%Í¡2 ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ*óÙ* |
2014 | - ÿÿÿ ÿÿÿ *ùÃ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ&Ö` ÿÿÿ ÿÿÿ *ö¤+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ)ðf ÿÿÿ ÿÿÿ 'ÞJ+þÿ+þÿ+þÿ+þÿ)êÐ'Ù(é*õ *ôC*öB*öB+úA+úA+úA(ä *ö!+úA)ð ÿÿÿ ÿÿÿ 'ÞJ+þÿ+þÿ+þÿ+þÿ%Ë¢/ ÿÿÿ ÿÿÿ 'ÞJ+þÿ+þÿ+þÿ+þÿ(åÄ0 |
2015 | - ÿÿÿ ÿÿÿ 'ÞJ+þÿ+þÿ+þÿ+þÿ)êÐ0 |
2016 | ÿÿÿ ÿÿÿ 'ÞJ+þÿ+þÿ+þÿ+þÿ)êÐ0 !(/J4 |
2017 | B ¢ ÿÿÿ ÿÿÿ 'áI+þÿ+þÿ+þÿ+þÿ)êÐ0 !,37; |
2018 | KYÛYÛ3"(éF'ÞJ ÿÿÿ ÿÿÿ (äH+þÿ+þÿ+þÿ+þÿ)êÐ0 %4?* |
2019 | \8w( |
2020 | bVÒ]ÿ>A3"(éF&Ñ; ÿÿÿ ÿÿÿ (æG+þÿ+þÿ+þÿ+þÿ)êÐ0 |
2021 | C_VÁ\ó]ÿ]ÿ]ÿ]ÿ]ÿJ¨ |
2022 | WD5!(æG'á[ ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0 (%/ |
2023 | &ZÆ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ[ô=B/(äH)î ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0 J*\âGn893.+Z×]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ?7'ÞJ)í" ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0R]ÿEHFC@=>jS¤[ä]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ[ô8'ÛK)ë)ë ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0,, |
2024 | T]ÿ[ôN²VÓN²G0 |
2025 | nHA5S]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ@e(çj(ç &Ö` ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0(N[ô]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿVÓ8zD4Kg]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿD] |
2026 | -)ð)ë"$ÃU |
2027 | - ÿÿÿ ÿÿÿ +þÿ+þÿ+þÿ+þÿ)êÐ0 |
2028 | -- |
2029 | )YÙ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿC>)V]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ>5 |
2030 | -)ð*öÆ%'Ý |
2031 | ÿÿÿ ÿÿÿ +ýð+þÿ+þÿ+þÿ)êÐ0W«]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ:r-, |
2032 | *]ÿ]ÿ]ÿ]ÿ]ÿ]ÿX)ð*öÆ''áÿÿÿ ÿÿÿ *öÅ+þÿ+þÿ+þÿ)êÐ0J*]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿUÃ+[Ä]ÿ]ÿ]ÿ]ÿ[´)ð*õÇ}E'Ü$ |
2033 | -ÿÿÿ ÿÿÿ *öÅ+þÿ+þÿ+þÿ)êÐ0WE]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿXÍ#]ð]ÿ]ÿ\áYe )ð*õÇ!«b'Ù"°_ÿÿÿ ÿÿÿ *öÅ+þÿ+þÿ+þÿ)êÐ0X3]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿYÊL)\\rZ2 *ò*õÇ!§d)ê¿!¬aÿÿÿ ÿÿÿ *öÅ+þÿ+þÿ+þÿ)êÐ0]à]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿT *ò*õÇ&Ö+ûò!«b |
2034 | -ÿÿÿ ÿÿÿ *öÅ+þÿ+þÿ+þÿ)êÐ0 \A]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ[Ó *ò*õÇ&Ö+þÿzG ÿÿÿ ÿÿÿ *÷Ä+þÿ+þÿ+þÿ)êÐ0 \A]à]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ]ÿ[³E (éi+üñ&Ö+þÿ. ÿÿÿ ÿÿÿ *÷Ä+þÿ+þÿ+þÿ)êÐ0 \a]°]ÿ]ÿ]ÿ]ÿ]à[¢XD 'ÞJ+þÿ&Ö+þÿ/ ÿÿÿ ÿÿÿ *÷Ä+þÿ+þÿ+þÿ)êÐ0 'ÛK+þÿ&Õ+þÿ0 ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)êÐ0 &ÖM+þÿ&Ó+þÿ1 ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)êÐ0 &ÖM+þÿ'áµ+þÿ2 ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)êÐ0 )î+þÿ)ìÎ+þÿ2 ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)êÐ/ )î+þÿ)ìÎ+þÿ3 |
2035 | - ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)êÐ. )í+þÿ)ìÎ+þÿ4ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)ëÏ+ )ë+þÿ)ëÏ+þÿ6 |
2036 | ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ)ëÏ+ )î+þÿ)ëÏ+þÿFD |
2037 | ÿÿÿ ÿÿÿ )î+þÿ+þÿ+þÿ%Í¡0 |
2038 | |
2039 | |
2040 | - *öÆ+þÿ)êÐ+þÿk!ÿÿÿ ÿÿÿ )ð+þÿ+þÿ+þÿ%Ê£:-%""""" )ñÊ+þÿ(éÑ+þÿk! |
2041 | ÿÿÿ ÿÿÿ *ò+þÿ+þÿ+þÿ$ǦG@<;;;;;:97776542222222210/0248)ëÏ+þÿ*ôé+þÿk ÿÿÿ ÿÿÿ *ò+þÿ+þÿ+þÿ'Ù¼ywwvvuut=REEDDDB@>====>>?>=;<?CF(éÑ+þÿ+þÿ+þÿ ¢h |
2042 | -ÿÿÿ ÿÿÿ (äH+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ!®` ÿÿÿ ÿÿÿ )íE+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ*òÉ*òÉ*òÉ*òÉ*òÉ*òÉ*òÉ*òÉ*òÉ)ñÊ)ì½'Û'Û)ñÊ+ûò+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ ÿÿÿ ÿÿÿ *öB+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+þÿ+ûâ ÿÿÿ ÿÿÿ )ð+ü +ýÀ+ûÁ+û±+ûÁ+ûÁ+ûÁ*ù+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ú+ýÀ+ûÁ+ûÁ+ûÁ+ûÁ+ûÁ+ûÁ+ûÁ+ûÁ+ûÁ+þÿ+þï*óT ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿ ÿÿÿÿÿÿ ÿÿÿÿÿÿ ÿÿÿÿÿÿ ÿÿÿÿÿÿ ÿÿÿÿÀÿ ø ÿ à ÿ à à áÿÿÿÿÿ áÿÿÿÿÿ áÿÿÿÿÿ áÿÿÿÿÿ áÿÿÿÿÿ áÿÿÿÿÿ áÿÿþÿÿ áÿÿàÿÿ áÿÿ ÿ áÿþ ÿ áÿÀÿ áÿàÿ áÿðÿ áü xÿ ñø 8ÿ ñð <?ÿ ñð <ÿÿ ñð ?ÿÿ ñø ?ÿÿ ñø ÿß ñþ ÿÿß ñÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ_ ñÿÿÿÿ ð ð ÿø ð ? ÿÿÿÿÿ ÿÿÿÿÿÿ |
2043 | \ Pas de fin de ligne à la fin du fichier. |
2044 | diff -BruNa smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/icon_p1.png smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/icon_p1.png |
2045 | --- smeserver-ejabberd-2.0.0-1/root/opt/ejabberd/doc/img/icon_p1.png 2008-02-21 12:27:18.000000000 +0100 |
2046 | +++ smeserver-ejabberd-2.0.0-2/root/opt/ejabberd/doc/img/icon_p1.png 1970-01-01 01:00:00.000000000 +0100 |
2047 | @@ -1,11 +0,0 @@ |
2048 | -PNG |
2049 | - |
2050 | - |
2051 | IHDR 0 0 Wù sBIT|d pHYs ÒÝ~ü tEXtSoftware Macromedia Fireworks MX»*$ tEXtCreation Time 04/20/06y15& |