From 0eb38f5f296702d1e4b114f84273015720f079f1 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 20 Jan 2010 10:28:34 +0000 Subject: [PATCH] fixed syscp-bug #1282; --- TODO | 2 +- .../debian_etch/dovecot/etc_dovecot_dovecot-sql.conf | 10 +++++----- .../debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf | 10 +++++----- .../ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/TODO b/TODO index fe0fa7a4..1d4f3b3e 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ - 0001282 Homedirs von Dovecot identisch +FIXED 0001282 Homedirs von Dovecot identisch 0001274 Option to mark a Domain as Subdomain possible or not FIXED 0001283 SysCP creating broken lighttpd config files 0001213 APS class_apsinstaller.php on line 510 - error installing different apps diff --git a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf index 4e392b7f..98eefda5 100644 --- a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf @@ -1,5 +1,5 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' -user_query = SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u' +driver = mysql +connect = host= dbname= user= password= +default_pass_scheme = CRYPT +password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u' diff --git a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf index 4e392b7f..98eefda5 100644 --- a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot-sql.conf @@ -1,5 +1,5 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' -user_query = SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u' +driver = mysql +connect = host= dbname= user= password= +default_pass_scheme = CRYPT +password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u' diff --git a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf index 4e392b7f..98eefda5 100644 --- a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf @@ -1,5 +1,5 @@ -driver = mysql -connect = host= dbname= user= password= -default_pass_scheme = CRYPT -password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' -user_query = SELECT CONCAT(homedir, maildir) AS home, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u' +driver = mysql +connect = host= dbname= user= password= +default_pass_scheme = CRYPT +password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE username = '%u' OR email = '%u' +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u'