From b1b2eec21f0f0d64c5abf94d3d115f2743125e9d Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 13 Sep 2010 05:50:10 +0000 Subject: [PATCH] - fix Ubuntu Lucid dovecot-configuration-templates, fixes #401 refs #401 --- .../dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf | 7 ++----- .../ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf | 2 +- .../ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf index d39c2793..508402f9 100644 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf +++ b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf @@ -1,5 +1,5 @@ # Some general options -protocols = imap pop3 managesieve +protocols = imap pop3 mail_access_groups = vmail ## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS disable_plaintext_auth = no @@ -29,8 +29,7 @@ protocol pop3 { protocol lda { # postmaster is the one in charge of the mail system. MUST be set to a valid address! postmaster_address = - mail_plugins = managesieve quota - quota_full_tempfail = yes + mail_plugins = quota deliver_log_format = msgid=%m: %$ rejection_reason = Your message to <%t> was automatically rejected:%n%r } @@ -38,6 +37,4 @@ protocol lda { # Plugins configuration plugin { quota = maildir - sieve=~/.dovecot.sieve - sieve_dir=~/sieve } diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf index ff1f064b..bbe09293 100644 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf +++ b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf @@ -2,4 +2,4 @@ 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' +user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE username = '%u' OR email = '%u' diff --git a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf index 678bb9cd..f613a782 100644 --- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf +++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_master.cf @@ -1,4 +1,4 @@ # Add this lines to be able to use dovecot as delivery agent # Dovecot LDA dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient} + flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -c /etc/dovecot/conf.d/01-dovecot-postfix.conf -d ${recipient}