diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-21 09:27:03 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-21 09:27:03 +0200 |
| commit | efe3b62084480b62caf2f01647803b38ed3f3c20 (patch) | |
| tree | 2b9b5a4bd1bd298a75507e60eace198b523bfc9f | |
| parent | 79543bec2aa24f83d3fddbbcc749d1b95d9964aa (diff) | |
| parent | bec9690ff519d33d7ef3f0c8f8f8cf72b4ef059d (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | config/db.inc.php.dist | 19 | ||||
| -rw-r--r-- | config/main.inc.php.dist | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist index 17a273a0c..b1f142e56 100644 --- a/config/db.inc.php.dist +++ b/config/db.inc.php.dist @@ -5,29 +5,24 @@ | Configuration file for database access | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2012, The Roundcube Dev Team | + | Copyright (C) 2005-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | - | | +-----------------------------------------------------------------------+ - */ $rcmail_config = array(); -// PEAR database DSN for read/write operations -// format is db_provider://user:password@host/database +// Database connection string (DSN) for read+write operations +// Format (compatible with PEAR MDB2): db_provider://user:password@host/database +// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php -// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql or sqlsrv - +// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646' $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail'; -// Warning: for SQLite use absolute path in DSN: -// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646'; -// PEAR database DSN for read only operations (if empty write database will be used) +// Database DSN for read-only operations (if empty write database will be used) // useful for database replication $rcmail_config['db_dsnr'] = ''; @@ -38,5 +33,3 @@ $rcmail_config['db_persistent'] = FALSE; // you can define specific table (and sequence) names prefix $rcmail_config['db_prefix'] = ''; - -// end db config file diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 05afed9b8..da5c5f340 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -892,5 +892,3 @@ $rcmail_config['default_font'] = ''; // Enables display of email address with name instead of a name (and address in title) $rcmail_config['message_show_email'] = false; - -// end of config file |