Преглед изворни кода

Merge pull request #319 from mikeashley/fixes/roundcube-backport

Update roundcube role to use wheezy backports
Alex Payne пре 10 година
родитељ
комит
ae1cb76f3d
2 измењених фајлова са 204 додато и 97 уклоњено
  1. 184
    93
      roles/webmail/files/etc_roundcube_main.inc.php
  2. 20
    4
      roles/webmail/tasks/roundcube.yml

+ 184
- 93
roles/webmail/files/etc_roundcube_main.inc.php Прегледај датотеку

@@ -6,7 +6,10 @@
6 6
 |                                                                       |
7 7
 | This file is part of the Roundcube Webmail client                     |
8 8
 | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
9
-| Licensed under the GNU GPL                                            |
9
+|                                                                       |
10
+| Licensed under the GNU General Public License version 3 or            |
11
+| any later version with exceptions for skins & plugins.                |
12
+| See the README file for a full license statement.                     |
10 13
 |                                                                       |
11 14
 +-----------------------------------------------------------------------+
12 15
 
@@ -18,14 +21,14 @@ $rcmail_config = array();
18 21
 // LOGGING/DEBUGGING
19 22
 // ----------------------------------
20 23
 
21
-// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
24
+// system error reporting, sum of: 1 = log; 4 = show, 8 = trace
22 25
 $rcmail_config['debug_level'] = 1;
23 26
 
24 27
 // log driver:  'syslog' or 'file'.
25 28
 $rcmail_config['log_driver'] = 'file';
26 29
 
27 30
 // date format for log entries
28
-// (read http://php.net/manual/en/function.date.php for all format characters)
31
+// (read http://php.net/manual/en/function.date.php for all format characters)  
29 32
 $rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';
30 33
 
31 34
 // Syslog ident string to use, if using the 'syslog' log driver.
@@ -60,22 +63,24 @@ $rcmail_config['smtp_debug'] = false;
60 63
 // IMAP
61 64
 // ----------------------------------
62 65
 
63
-// the mail host chosen to perform the log-in
64
-// leave blank to show a textbox at login, give a list of hosts
66
+// The mail host chosen to perform the log-in.
67
+// Leave blank to show a textbox at login, give a list of hosts
65 68
 // to display a pulldown menu or set one host as string.
66 69
 // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
67 70
 // Supported replacement variables:
68
-// %n - http hostname ($_SERVER['SERVER_NAME'])
69
-// %d - domain (http hostname without the first part)
71
+// %n - hostname ($_SERVER['SERVER_NAME'])
72
+// %t - hostname without the first part
73
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
70 74
 // %s - domain name after the '@' from e-mail address provided at login screen
71
-// For example %n = mail.domain.tld, %d = domain.tld
72
-// $rcmail_config['default_host'] = '';
75
+// For example %n = mail.domain.tld, %t = domain.tld
76
+// WARNING: After hostname change update of mail_host column in users table is
77
+//          required to match old user data records with the new host.
73 78
 $rcmail_config['default_host'] = 'ssl://127.0.0.1:993';
74 79
 
75 80
 // TCP port used for IMAP connections
76
-// $rcmail_config['default_port'] = 143;
81
+$rcmail_config['default_port'] = 143;
77 82
 
78
-// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
83
+// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use
79 84
 // best server supported one)
80 85
 $rcmail_config['imap_auth_type'] = null;
81 86
 
@@ -104,6 +109,10 @@ $rcmail_config['imap_force_caps'] = false;
104 109
 // Enable this option to force LSUB command usage instead.
105 110
 $rcmail_config['imap_force_lsub'] = false;
106 111
 
112
+// Some server configurations (e.g. Courier) doesn't list folders in all namespaces
113
+// Enable this option to force listing of folders in all namespaces
114
+$rcmail_config['imap_force_ns'] = false;
115
+
107 116
 // IMAP connection timeout, in seconds. Default: 0 (no limit)
108 117
 $rcmail_config['imap_timeout'] = 0;
109 118
 
@@ -129,24 +138,23 @@ $rcmail_config['messages_cache'] = false;
129 138
 // If left blank, the PHP mail() function is used
130 139
 // Supported replacement variables:
131 140
 // %h - user's IMAP hostname
132
-// %n - http hostname ($_SERVER['SERVER_NAME'])
133
-// %d - domain (http hostname without the first part)
141
+// %n - hostname ($_SERVER['SERVER_NAME'])
142
+// %t - hostname without the first part
143
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
134 144
 // %z - IMAP domain (IMAP hostname without the first part)
135
-// For example %n = mail.domain.tld, %d = domain.tld
136
-// $rcmail_config['smtp_server'] = '';
145
+// For example %n = mail.domain.tld, %t = domain.tld
137 146
 $rcmail_config['smtp_server'] = 'ssl://127.0.0.1';
138 147
 
139
-// SMTP port (default is 25; 465 for SSL)
148
+// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
149
+// deprecated SSL over SMTP (aka SMTPS))
140 150
 $rcmail_config['smtp_port'] = 465;
141 151
 
142 152
 // SMTP username (if required) if you use %u as the username Roundcube
143 153
 // will use the current username for login
144
-//$rcmail_config['smtp_user'] = '';
145 154
 $rcmail_config['smtp_user'] = '%u';
146 155
 
147 156
 // SMTP password (if required) if you use %p as the password Roundcube
148 157
 // will use the current user's password for login
149
-//$rcmail_config['smtp_pass'] = '';
150 158
 $rcmail_config['smtp_pass'] = '%p';
151 159
 
152 160
 // SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
@@ -159,13 +167,15 @@ $rcmail_config['smtp_auth_cid'] = null;
159 167
 // Optional SMTP authentication password to be used for smtp_auth_cid
160 168
 $rcmail_config['smtp_auth_pw'] = null;
161 169
 
162
-// SMTP HELO host
163
-// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
164
-// Leave this blank and you will get the server variable 'server_name' or
165
-// localhost if that isn't defined.
170
+// SMTP HELO host 
171
+// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages 
172
+// Leave this blank and you will get the server variable 'server_name' or 
173
+// localhost if that isn't defined. 
166 174
 $rcmail_config['smtp_helo_host'] = '';
167 175
 
168 176
 // SMTP connection timeout, in seconds. Default: 0 (no limit)
177
+// Note: There's a known issue where using ssl connection with
178
+// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
169 179
 $rcmail_config['smtp_timeout'] = 0;
170 180
 
171 181
 // ----------------------------------
@@ -176,6 +186,25 @@ $rcmail_config['smtp_timeout'] = 0;
176 186
 // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
177 187
 $rcmail_config['enable_installer'] = false;
178 188
 
189
+// don't allow these settings to be overriden by the user
190
+$rcmail_config['dont_override'] = array();
191
+
192
+// provide an URL where a user can get support for this Roundcube installation
193
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
194
+$rcmail_config['support_url'] = '';
195
+
196
+// replace Roundcube logo with this image
197
+// specify an URL relative to the document root of this Roundcube installation
198
+$rcmail_config['skin_logo'] = null;
199
+
200
+// automatically create a new Roundcube user when log-in the first time.
201
+// a new user will be created once the IMAP login succeeds.
202
+// set to false if only registered users can use this service
203
+$rcmail_config['auto_create_user'] = true;
204
+
205
+// Enables possibility to log in using email address from user identities
206
+$rcmail_config['user_aliases'] = false;
207
+
179 208
 // use this folder to store log files (must be writeable for apache user)
180 209
 // This is used by the 'file' log driver.
181 210
 $rcmail_config['log_dir'] = 'logs/';
@@ -195,48 +224,49 @@ $rcmail_config['force_https'] = true;
195 224
 // tell PHP that it should work as under secure connection
196 225
 // even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
197 226
 // e.g. when you're running Roundcube behind a https proxy
227
+// this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
198 228
 $rcmail_config['use_https'] = false;
199 229
 
200 230
 // Allow browser-autocompletion on login form.
201 231
 // 0 - disabled, 1 - username and host only, 2 - username, host, password
202 232
 $rcmail_config['login_autocomplete'] = 0;
203 233
 
204
-// If users authentication is not case sensitive this must be enabled.
205
-// You can also use it to force conversion of logins to lower case.
206
-// After enabling it all user records need to be updated, e.g. with query:
207
-// UPDATE users SET username = LOWER(username);
208
-$rcmail_config['login_lc'] = false;
209
-
210
-// automatically create a new Roundcube user when log-in the first time.
211
-// a new user will be created once the IMAP login succeeds.
212
-// set to false if only registered users can use this service
213
-$rcmail_config['auto_create_user'] = true;
214
-
215
-// replace Roundcube logo with this image
216
-// specify an URL relative to the document root of this Roundcube installation
217
-$rcmail_config['skin_logo'] = null;
234
+// Forces conversion of logins to lower case.
235
+// 0 - disabled, 1 - only domain part, 2 - domain and local part.
236
+// If users authentication is case-insensitive this must be enabled.
237
+// Note: After enabling it all user records need to be updated, e.g. with query:
238
+//       UPDATE users SET username = LOWER(username);
239
+$rcmail_config['login_lc'] = 2;
218 240
 
219 241
 // Includes should be interpreted as PHP files
220 242
 $rcmail_config['skin_include_php'] = false;
221 243
 
244
+// display software version on login screen
245
+$rcmail_config['display_version'] = false;
246
+
222 247
 // Session lifetime in minutes
223
-// must be greater than 'keep_alive'/60
224 248
 $rcmail_config['session_lifetime'] = 10;
225 249
 
226
-// session domain: .example.org
250
+// Session domain: .example.org
227 251
 $rcmail_config['session_domain'] = '';
228 252
 
229
-// session name. Default: 'roundcube_sessid'
253
+// Session name. Default: 'roundcube_sessid'
230 254
 $rcmail_config['session_name'] = null;
231 255
 
256
+// Session authentication cookie name. Default: 'roundcube_sessauth'
257
+$rcmail_config['session_auth_name'] = null;
258
+
259
+// Session path. Defaults to PHP session.cookie_path setting.
260
+$rcmail_config['session_path'] = null;
261
+
232 262
 // Backend to use for session storage. Can either be 'db' (default) or 'memcache'
233 263
 // If set to memcache, a list of servers need to be specified in 'memcache_hosts'
234 264
 // Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
235 265
 $rcmail_config['session_storage'] = 'db';
236 266
 
237 267
 // Use these hosts for accessing memcached
238
-// Define any number of hosts in the form hostname:port
239
-$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' );
268
+// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
269
+$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
240 270
 
241 271
 // check client IP in session athorization
242 272
 $rcmail_config['ip_check'] = false;
@@ -258,10 +288,11 @@ $rcmail_config['des_key'] = 'cQro25fVv3ruWTNh0a6Sm1Rp';
258 288
 // Specify an array with 'host' => 'domain' values to support multiple hosts
259 289
 // Supported replacement variables:
260 290
 // %h - user's IMAP hostname
261
-// %n - http hostname ($_SERVER['SERVER_NAME'])
262
-// %d - domain (http hostname without the first part)
291
+// %n - hostname ($_SERVER['SERVER_NAME'])
292
+// %t - hostname without the first part
293
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
263 294
 // %z - IMAP domain (IMAP hostname without the first part)
264
-// For example %n = mail.domain.tld, %d = domain.tld
295
+// For example %n = mail.domain.tld, %t = domain.tld
265 296
 $rcmail_config['username_domain'] = '';
266 297
 
267 298
 // This domain will be used to form e-mail addresses of new users
@@ -271,7 +302,7 @@ $rcmail_config['username_domain'] = '';
271 302
 // %n - http hostname ($_SERVER['SERVER_NAME'])
272 303
 // %d - domain (http hostname without the first part)
273 304
 // %z - IMAP domain (IMAP hostname without the first part)
274
-// For example %n = mail.domain.tld, %d = domain.tld
305
+// For example %n = mail.domain.tld, %t = domain.tld
275 306
 $rcmail_config['mail_domain'] = '';
276 307
 
277 308
 // Password charset.
@@ -283,11 +314,11 @@ $rcmail_config['password_charset'] = 'ISO-8859-1';
283 314
 $rcmail_config['sendmail_delay'] = 0;
284 315
 
285 316
 // Maximum number of recipients per message. Default: 0 (no limit)
286
-$rcmail_config['max_recipients'] = 0;
317
+$rcmail_config['max_recipients'] = 0; 
287 318
 
288 319
 // Maximum allowednumber of members of an address group. Default: 0 (no limit)
289 320
 // If 'max_recipients' is set this value should be less or equal
290
-$rcmail_config['max_group_members'] = 0;
321
+$rcmail_config['max_group_members'] = 0; 
291 322
 
292 323
 // add this user-agent to message headers when sending
293 324
 $rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;
@@ -327,14 +358,16 @@ $rcmail_config['line_length'] = 72;
327 358
 // send plaintext messages as format=flowed
328 359
 $rcmail_config['send_format_flowed'] = true;
329 360
 
330
-// don't allow these settings to be overriden by the user
331
-$rcmail_config['dont_override'] = array();
361
+// According to RFC2298, return receipt envelope sender address must be empty.
362
+// If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
363
+$rcmail_config['mdn_use_from'] = false;
332 364
 
333 365
 // Set identities access level:
334 366
 // 0 - many identities with possibility to edit all params
335 367
 // 1 - many identities with possibility to edit all params but not email address
336 368
 // 2 - one identity with possibility to edit all params
337 369
 // 3 - one identity with possibility to edit all params but not email address
370
+// 4 - one identity with possibility to edit only signature
338 371
 $rcmail_config['identities_level'] = 0;
339 372
 
340 373
 // Mimetypes supported by the browser.
@@ -342,8 +375,15 @@ $rcmail_config['identities_level'] = 0;
342 375
 // either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf'
343 376
 $rcmail_config['client_mimetypes'] = null;  # null == default
344 377
 
345
-// mime magic database
346
-$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
378
+// Path to a local mime magic database file for PHPs finfo extension.
379
+// Set to null if the default path should be used.
380
+$rcmail_config['mime_magic'] = null;
381
+
382
+// Absolute path to a local mime.types mapping table file.
383
+// This is used to derive mime-types from the filename extension or vice versa.
384
+// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
385
+// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
386
+$rcmail_config['mime_types'] = null;
347 387
 
348 388
 // path to imagemagick identify binary
349 389
 $rcmail_config['im_identify_path'] = null;
@@ -351,12 +391,21 @@ $rcmail_config['im_identify_path'] = null;
351 391
 // path to imagemagick convert binary
352 392
 $rcmail_config['im_convert_path'] = null;
353 393
 
394
+// Size of thumbnails from image attachments displayed below the message content.
395
+// Note: whether images are displayed at all depends on the 'inline_images' option.
396
+// Set to 0 to display images in full size.
397
+$rcmail_config['image_thumbnail_size'] = 240;
398
+
354 399
 // maximum size of uploaded contact photos in pixel
355 400
 $rcmail_config['contact_photo_size'] = 160;
356 401
 
357 402
 // Enable DNS checking for e-mail address validation
358 403
 $rcmail_config['email_dns_check'] = false;
359 404
 
405
+// Disables saving sent messages in Sent folder (like gmail) (Default: false)
406
+// Note: useful when SMTP server stores sent mail in user mailbox
407
+$rcmail_config['no_save_sent_messages'] = false;
408
+
360 409
 // ----------------------------------
361 410
 // PLUGINS
362 411
 // ----------------------------------
@@ -368,16 +417,16 @@ $rcmail_config['plugins'] = array('managesieve', 'carddav', 'twofactor_gauthenti
368 417
 // USER INTERFACE
369 418
 // ----------------------------------
370 419
 
371
-// default messages sort column. Use empty value for default server's sorting,
372
-// or 'arrival', 'date', 'subject', 'from', 'to', 'size', 'cc'
420
+// default messages sort column. Use empty value for default server's sorting, 
421
+// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc'
373 422
 $rcmail_config['message_sort_col'] = '';
374 423
 
375 424
 // default messages sort order
376 425
 $rcmail_config['message_sort_order'] = 'DESC';
377 426
 
378 427
 // These cols are shown in the message list. Available cols are:
379
-// subject, from, to, cc, replyto, date, size, status, flag, attachment, 'priority'
380
-$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment');
428
+// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority'
429
+$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment');
381 430
 
382 431
 // the default locale setting (leave empty for auto-detection)
383 432
 // RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
@@ -387,7 +436,8 @@ $rcmail_config['language'] = 'en_US';
387 436
 $rcmail_config['date_format'] = 'Y-m-d';
388 437
 
389 438
 // give this choice of date formats to the user to select from
390
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
439
+// Note: do not use ambiguous formats like m/d/Y
440
+$rcmail_config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
391 441
 
392 442
 // use this format for time display (date or strftime format)
393 443
 $rcmail_config['time_format'] = 'H:i';
@@ -423,16 +473,15 @@ $rcmail_config['trash_mbox'] = 'Trash';
423 473
 // display these folders separately in the mailbox list.
424 474
 // these folders will also be displayed with localized names
425 475
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
426
-$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
476
+$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
427 477
 
428 478
 // automatically create the above listed default folders on first login
429
-// $rcmail_config['create_default_folders'] = false;
430 479
 $rcmail_config['create_default_folders'] = true;
431 480
 
432 481
 // protect the default folders from renames, deletes, and subscription changes
433 482
 $rcmail_config['protect_default_folders'] = true;
434 483
 
435
-// if in your system 0 quota means no limit set this option to true
484
+// if in your system 0 quota means no limit set this option to true 
436 485
 $rcmail_config['quota_zero_as_unlimited'] = false;
437 486
 
438 487
 // Make use of the built-in spell checker. It is based on GoogieSpell.
@@ -474,9 +523,8 @@ $rcmail_config['recipients_separator'] = ',';
474 523
 // don't let users set pagesize to more than this value if set
475 524
 $rcmail_config['max_pagesize'] = 200;
476 525
 
477
-// Minimal value of user's 'keep_alive' setting (in seconds)
478
-// Must be less than 'session_lifetime'
479
-$rcmail_config['min_keep_alive'] = 60;
526
+// Minimal value of user's 'refresh_interval' setting (in seconds)
527
+$rcmail_config['min_refresh_interval'] = 60;
480 528
 
481 529
 // Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option.
482 530
 // By default refresh time is set to 1 second. You can set this value to true
@@ -493,10 +541,12 @@ $rcmail_config['undo_timeout'] = 0;
493 541
 // ----------------------------------
494 542
 
495 543
 // This indicates which type of address book to use. Possible choises:
496
-// 'sql' (default) and 'ldap'.
544
+// 'sql' (default), 'ldap' and ''.
497 545
 // If set to 'ldap' then it will look at using the first writable LDAP
498 546
 // address book as the primary address book and it will not display the
499 547
 // SQL address book in the 'Address Book' view.
548
+// If set to '' then no address book will be displayed or only the
549
+// addressbook which is created by a plugin (like CardDAV).
500 550
 $rcmail_config['address_book_type'] = 'sql';
501 551
 
502 552
 // In order to enable public ldap search, configure an array like the Verisign
@@ -504,7 +554,7 @@ $rcmail_config['address_book_type'] = 'sql';
504 554
 // Array key must contain only safe characters, ie. a-zA-Z0-9_
505 555
 $rcmail_config['ldap_public'] = array();
506 556
 
507
-// If you are going to use LDAP for individual address books, you will need to
557
+// If you are going to use LDAP for individual address books, you will need to 
508 558
 // set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
509 559
 //
510 560
 // The recommended directory structure for LDAP is to store all the address book entries
@@ -524,14 +574,16 @@ $rcmail_config['ldap_public']['Verisign'] = array(
524 574
 'name'          => 'Verisign.com',
525 575
 // Replacement variables supported in host names:
526 576
 // %h - user's IMAP hostname
527
-// %n - http hostname ($_SERVER['SERVER_NAME'])
528
-// %d - domain (http hostname without the first part)
577
+// %n - hostname ($_SERVER['SERVER_NAME'])
578
+// %t - hostname without the first part
579
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
529 580
 // %z - IMAP domain (IMAP hostname without the first part)
530
-// For example %n = mail.domain.tld, %d = domain.tld
581
+// For example %n = mail.domain.tld, %t = domain.tld
531 582
 'hosts'         => array('directory.verisign.com'),
532 583
 'port'          => 389,
533 584
 'use_tls'	      => false,
534 585
 'ldap_version'  => 3,       // using LDAPv3
586
+'network_timeout' => 10,    // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
535 587
 'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
536 588
 // %fu - The full username provided, assumes the username is an email
537 589
 //       address, uses the username_domain value if not an email address.
@@ -571,26 +623,47 @@ $rcmail_config['ldap_public']['Verisign'] = array(
571 623
 // The RDN field that is used for new entries, this field needs
572 624
 // to be one of the search_fields, the base of base_dn is appended
573 625
 // to the RDN to insert into the LDAP directory.
574
-'LDAP_rdn'       => 'mail',
626
+'LDAP_rdn'       => 'cn',
575 627
 // The required fields needed to build a new contact as required by
576 628
 // the object classes (can include additional fields not required by the object classes).
577 629
 'required_fields' => array('cn', 'sn', 'mail'),
578 630
 'search_fields'   => array('mail', 'cn'),  // fields to search in
579 631
 // mapping of contact fields to directory attributes
632
+//   for every attribute one can specify the number of values (limit) allowed.
633
+//   default is 1, a wildcard * means unlimited
580 634
 'fieldmap' => array(
581
-// Roundcube  => LDAP
635
+// Roundcube  => LDAP:limit
582 636
 'name'        => 'cn',
583 637
 'surname'     => 'sn',
584 638
 'firstname'   => 'givenName',
585
-'email'       => 'mail',
639
+'jobtitle'    => 'title',
640
+'email'       => 'mail:*',
586 641
 'phone:home'  => 'homePhone',
587 642
 'phone:work'  => 'telephoneNumber',
588 643
 'phone:mobile' => 'mobile',
644
+'phone:pager' => 'pager',
589 645
 'street'      => 'street',
590 646
 'zipcode'     => 'postalCode',
647
+'region'      => 'st',
591 648
 'locality'    => 'l',
592
-'country'     => 'c',
649
+// if you country is a complex object, you need to configure 'sub_fields' below
650
+'country'      => 'c',
593 651
 'organization' => 'o',
652
+'department'   => 'ou',
653
+'jobtitle'     => 'title',
654
+'notes'        => 'description',
655
+// these currently don't work:
656
+// 'phone:workfax' => 'facsimileTelephoneNumber',
657
+// 'photo'         => 'jpegPhoto',
658
+// 'manager'       => 'manager',
659
+// 'assistant'     => 'secretary',
660
+),
661
+// Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
662
+'sub_fields' => array(),
663
+// Generate values for the following LDAP attributes automatically when creating a new record
664
+'autovalues' => array(
665
+// 'uid'  => 'md5(microtime())',               // You may specify PHP code snippets which are then eval'ed 
666
+// 'mail' => '{givenname}.{sn}@mydomain.com',  // or composite strings with placeholders for existing attributes
594 667
 ),
595 668
 'sort'          => 'cn',    // The field to sort the listing by.
596 669
 'scope'         => 'sub',   // search mode: sub|base|list
@@ -605,7 +678,7 @@ $rcmail_config['ldap_public']['Verisign'] = array(
605 678
 // definition for contact groups (uncomment if no groups are supported)
606 679
 // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
607 680
 // if the groups base_dn is empty, the contact base_dn is used for the groups as well
608
-// -> in this case, assure that groups and contacts are separated due to the concernig filters!
681
+// -> in this case, assure that groups and contacts are separated due to the concernig filters! 
609 682
 'groups'        => array(
610 683
 'base_dn'     => '',
611 684
 'scope'       => 'sub',   // search mode: sub|base|list
@@ -654,10 +727,13 @@ $rcmail_config['addressbook_search_mode'] = 0;
654 727
 $rcmail_config['default_charset'] = 'UTF-8';
655 728
 
656 729
 // skin name: folder from skins/
657
-$rcmail_config['skin'] = 'default';
730
+$rcmail_config['skin'] = 'larry';
731
+
732
+// show up to X items in messages list view
733
+$rcmail_config['mail_pagesize'] = 50;
658 734
 
659
-// show up to X items in list view
660
-$rcmail_config['pagesize'] = 40;
735
+// show up to X items in contacts list view
736
+$rcmail_config['addressbook_pagesize'] = 50;
661 737
 
662 738
 // sort contacts by this col (preferably either one of name, firstname, surname)
663 739
 $rcmail_config['addressbook_sort_col'] = 'surname';
@@ -670,11 +746,10 @@ $rcmail_config['addressbook_sort_col'] = 'surname';
670 746
 $rcmail_config['addressbook_name_listing'] = 0;
671 747
 
672 748
 // use this timezone to display date/time
749
+// valid timezone identifers are listed here: php.net/manual/en/timezones.php
750
+// 'auto' will use the browser's timezone settings
673 751
 $rcmail_config['timezone'] = 'auto';
674 752
 
675
-// is daylight saving On? Default: (bool)date('I');
676
-$rcmail_config['dst_active'] = null;
677
-
678 753
 // prefer displaying HTML messages
679 754
 $rcmail_config['prefer_html'] = true;
680 755
 
@@ -684,8 +759,14 @@ $rcmail_config['prefer_html'] = true;
684 759
 // 2 - Always show inline images
685 760
 $rcmail_config['show_images'] = 0;
686 761
 
762
+// open messages in new window
763
+$rcmail_config['message_extwin'] = false;
764
+
765
+// open message compose form in new window
766
+$rcmail_config['compose_extwin'] = false;
767
+
687 768
 // compose html formatted messages by default
688
-// 0 - never, 1 - always, 2 - on reply to HTML message only
769
+// 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message
689 770
 $rcmail_config['htmleditor'] = 0;
690 771
 
691 772
 // show pretty dates as standard
@@ -707,7 +788,7 @@ $rcmail_config['logout_purge'] = false;
707 788
 // Compact INBOX on logout
708 789
 $rcmail_config['logout_expunge'] = false;
709 790
 
710
-// Display attached images below the message body
791
+// Display attached images below the message body 
711 792
 $rcmail_config['inline_images'] = true;
712 793
 
713 794
 // Encoding of long/non-ascii attachment names:
@@ -728,23 +809,27 @@ $rcmail_config['read_when_deleted'] = true;
728 809
 // Use 'Purge' to remove messages marked as deleted
729 810
 $rcmail_config['flag_for_deletion'] = false;
730 811
 
731
-// Default interval for keep-alive/check-recent requests (in seconds)
732
-// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime'
733
-$rcmail_config['keep_alive'] = 60;
812
+// Default interval for auto-refresh requests (in seconds)
813
+// These are requests for system state updates e.g. checking for new messages, etc.
814
+// Setting it to 0 disables the feature.
815
+$rcmail_config['refresh_interval'] = 60;
734 816
 
735 817
 // If true all folders will be checked for recent messages
736 818
 $rcmail_config['check_all_folders'] = false;
737 819
 
738 820
 // If true, after message delete/move, the next message will be displayed
739
-$rcmail_config['display_next'] = false;
821
+$rcmail_config['display_next'] = true;
740 822
 
741
-// 0 - Do not expand threads
742
-// 1 - Expand all threads automatically
743
-// 2 - Expand only threads with unread messages
823
+// 0 - Do not expand threads 
824
+// 1 - Expand all threads automatically 
825
+// 2 - Expand only threads with unread messages 
744 826
 $rcmail_config['autoexpand_threads'] = 0;
745 827
 
746
-// When replying place cursor above original message (top posting)
747
-$rcmail_config['top_posting'] = false;
828
+// When replying:
829
+// -1 - don't cite the original message
830
+// 0  - place cursor below the original message
831
+// 1  - place cursor above original message (top posting)
832
+$rcmail_config['reply_mode'] = 0;
748 833
 
749 834
 // When replying strip original signature from message
750 835
 $rcmail_config['strip_existing_sig'] = true;
@@ -756,16 +841,13 @@ $rcmail_config['strip_existing_sig'] = true;
756 841
 // 3 - Forwards and Replies only
757 842
 $rcmail_config['show_sig'] = 1;
758 843
 
759
-// When replying or forwarding place sender's signature above existing message
760
-$rcmail_config['sig_above'] = false;
761
-
762 844
 // Use MIME encoding (quoted-printable) for 8bit characters in message body
763 845
 $rcmail_config['force_7bit'] = false;
764 846
 
765 847
 // Defaults of the search field configuration.
766 848
 // The array can contain a per-folder list of header fields which should be considered when searching
767 849
 // The entry with key '*' stands for all folders which do not have a specific list set.
768
-// Please note that folder names should to be in sync with $rcmail_config['default_imap_folders']
850
+// Please note that folder names should to be in sync with $rcmail_config['default_folders']
769 851
 $rcmail_config['search_mods'] = null;  // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));
770 852
 
771 853
 // Defaults of the addressbook search field configuration.
@@ -777,6 +859,9 @@ $rcmail_config['addressbook_search_mods'] = null;  // Example: array('name'=>1,
777 859
 // when user is over quota and Trash is included in the quota.
778 860
 $rcmail_config['delete_always'] = false;
779 861
 
862
+// Directly delete messages in Junk instead of moving to Trash
863
+$rcmail_config['delete_junk'] = false;
864
+
780 865
 // Behavior if a received message requests a message delivery notification (read receipt)
781 866
 // 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
782 867
 // 3 = send automatically if sender is in addressbook, otherwise ask the user
@@ -787,6 +872,7 @@ $rcmail_config['mdn_requests'] = 0;
787 872
 $rcmail_config['mdn_default'] = 0;
788 873
 
789 874
 // Delivery Status Notification checkbox default state
875
+// Note: This can be used only if smtp_server is non-empty
790 876
 $rcmail_config['dsn_default'] = 0;
791 877
 
792 878
 // Place replies in the folder of the message being replied to
@@ -806,4 +892,9 @@ $rcmail_config['spellcheck_before_send'] = false;
806 892
 // Skip alternative email addresses in autocompletion (show one address per contact)
807 893
 $rcmail_config['autocomplete_single'] = false;
808 894
 
895
+// Default font for composed HTML message.
896
+// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New,
897
+// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
898
+$rcmail_config['default_font'] = 'Verdana';
899
+
809 900
 // end of config file

+ 20
- 4
roles/webmail/tasks/roundcube.yml Прегледај датотеку

@@ -1,9 +1,25 @@
1
-- name: Install Roundcube
1
+- name: Add backports for Roundcube on Debian
2
+  lineinfile: dest=/etc/apt/sources.list line="deb http://http.debian.net/debian wheezy-backports main"
3
+  when: ansible_distribution_release == 'wheezy'
4
+  
5
+- name: Update apt cache for backports
6
+  apt: update_cache=yes
7
+
8
+- name: Install Roundcube from wheezy-backports
9
+  apt: pkg={{ item }} state=latest default_release=wheezy-backports
10
+  with_items:
11
+  - roundcube
12
+  - roundcube-pgsql
13
+  - roundcube-plugins
14
+  when: ansible_distribution_release == 'wheezy'
15
+
16
+- name: Install Roundcube on Ubuntu 14.04 LTS
2 17
   apt: pkg={{ item }} state=latest
3 18
   with_items:
4
-    - roundcube
5
-    - roundcube-pgsql
6
-    - roundcube-plugins
19
+  - roundcube
20
+  - roundcube-pgsql
21
+  - roundcube-plugins
22
+  when: ansible_distribution_release == 'trusty'
7 23
 
8 24
 - name: Configure Roundcube database
9 25
   template: src={{ item.src }} dest={{ item.dest }} group={{ item.group }} mode={{ item.mode }} owner=root force=yes

Loading…
Откажи
Сачувај