diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-07-30 12:08:58 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-07-30 12:08:58 +0200 |
| commit | 6843acc9fced3dc1261e019ad4552b6e4c340ec7 (patch) | |
| tree | 67d4f85b6b99d49f1ad28aa98fca213b6962fd7d /config/main.inc.php.dist | |
| parent | 9f1652e29e2ed8be815cae4abf42bde989ffeb22 (diff) | |
| parent | 6d1253681547343dcffb398a7e485bfb70087b57 (diff) | |
Merged changes to skin folders
Diffstat (limited to 'config/main.inc.php.dist')
| -rw-r--r-- | config/main.inc.php.dist | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index ad37c1bee..740684be3 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -68,10 +68,11 @@ $rcmail_config['smtp_debug'] = false; // to display a pulldown menu or set one host as string. // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// // Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['default_host'] = ''; // TCP port used for IMAP connections @@ -135,10 +136,11 @@ $rcmail_config['messages_cache'] = false; // If left blank, the PHP mail() function is used // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['smtp_server'] = ''; // SMTP port (default is 25; use 587 for STARTTLS or 465 for the @@ -244,8 +246,8 @@ $rcmail_config['session_name'] = null; $rcmail_config['session_storage'] = 'db'; // Use these hosts for accessing memcached -// Define any number of hosts in the form hostname:port -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' ); +// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file +$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); // check client IP in session athorization $rcmail_config['ip_check'] = false; @@ -267,10 +269,11 @@ $rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str'; // Specify an array with 'host' => 'domain' values to support multiple hosts // Supported replacement variables: // %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) +// %n - hostname ($_SERVER['SERVER_NAME']) +// %t - hostname without the first part +// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['username_domain'] = ''; // This domain will be used to form e-mail addresses of new users @@ -280,7 +283,7 @@ $rcmail_config['username_domain'] = ''; // %n - http hostname ($_SERVER['SERVER_NAME']) // %d - domain (http hostname without the first part) // %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld +// For example %n = mail.domain.tld, %t = domain.tld $rcmail_config['mail_domain'] = ''; // Password charset. @@ -532,10 +535,11 @@ $rcmail_config['ldap_public']['Verisign'] = array( 'name' => 'Verisign.com', // Replacement variables supported in host names: // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) + // %n - hostname ($_SERVER['SERVER_NAME']) + // %t - hostname without the first part + // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld + // For example %n = mail.domain.tld, %t = domain.tld 'hosts' => array('directory.verisign.com'), 'port' => 389, 'use_tls' => false, |