]> git.donarmstrong.com Git - roundcube.git/blob - debian/patches/dbconfig-common_support.patch
Merge commit 'upstream/0.3.1' into unstable-import
[roundcube.git] / debian / patches / dbconfig-common_support.patch
1 The default db.inc.php is modified to adapt it to the use of dbconfig-common package.
2
3 --- roundcube_0.1~beta2.2/config/db.inc.php.dist        2006-03-20 23:08:51.000000000 +0100
4 +++ roundcube_0.1~beta2.2/config/db.inc.php.dist  2007-03-13 14:33:38.000000000 +0100
5 @@ -14,13 +14,20 @@
6
7  $rcmail_config = array();
8
9 -// PEAR database DSN for read/write operations
10 -// format is db_provider://user:password@host/database 
11 -// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql
12 -
13 -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
14 -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
15 -// sqlite example: 'sqlite://./sqlite.db?mode=0646';
16 +/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */
17 +
18 +include_once("/etc/roundcube/debian-db.php");
19 +
20 +switch ($dbtype) {
21 + case "sqlite":
22 +   $rcmail_config['db_dsnw'] = "sqlite:///$basepath/$dbname?mode=0640";
23 +   break;
24 + default:
25 +   if ($dbport != '') $dbport=":$dbport";
26 +   if ($dbserver == '') $dbserver="localhost";
27 +   $rcmail_config['db_dsnw'] = "$dbtype://$dbuser:$dbpass@$dbserver$dbport/$dbname";
28 +   break;
29 + }
30
31  // PEAR database DSN for read only operations (if empty write database will be used)
32  // useful for database replication
33