From 84c9ac7e82cda29cc0244875a92bd007614cfbc1 Mon Sep 17 00:00:00 2001 From: "Robert Foerster (Dessa)" Date: Tue, 25 May 2010 22:19:29 +0000 Subject: [PATCH] tweak dovecot configuration for lucid to work, fixes 248 --- lib/configfiles/lucid.inc.php | 2 +- .../etc_dovecot_auth.d_01-dovecot-postfix.auth | 13 +++++++++++++ .../etc_dovecot_conf.d_01-dovecot-postfix.conf | 15 --------------- ...ecot-sql.conf => etc_dovecot_dovecot-sql.conf} | 0 4 files changed, 14 insertions(+), 16 deletions(-) rename templates/misc/configfiles/ubuntu_lucid/dovecot/{etc_dovecot_conf.d_02-dovecot-sql.conf => etc_dovecot_dovecot-sql.conf} (100%) diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php index d1ca92b8..38f4a7f4 100644 --- a/lib/configfiles/lucid.inc.php +++ b/lib/configfiles/lucid.inc.php @@ -230,7 +230,7 @@ return Array( 'files' => Array( 'etc_dovecot_auth.d_01-dovecot-postfix.auth' => '/etc/dovecot/auth.d/01-dovecot-postfix.auth', 'etc_dovecot_conf.d_01-dovecot-postfix.conf' => '/etc/dovecot/conf.d/01-dovecot-postfix.conf', - 'etc_dovecot_conf.d_02-dovecot-sql.conf' => '/etc/dovecot/conf.d/02-dovecot-sql.conf' + 'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf' ), 'restart' => Array( '/etc/init.d/dovecot restart' diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth index ba9f0987..78ac2f5b 100644 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth +++ b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_auth.d_01-dovecot-postfix.auth @@ -13,3 +13,16 @@ socket listen { group = vmail } } + +passdb sql { + args = /etc/dovecot/dovecot-sql.conf +} + +userdb prefetch { +} + +userdb sql { + args = /etc/dovecot/dovecot-sql.conf +} + +user = vmail \ No newline at end of file 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 9c1cd535..3dda0e74 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 @@ -35,21 +35,6 @@ protocol lda { rejection_reason = Your message to <%t> was automatically rejected:%n%r } -auth default { - passdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - userdb prefetch { - } - - userdb sql { - args = /etc/dovecot/dovecot-sql.conf - } - - user = vmail -} - # Plugins configuration plugin { quota = maildir diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_02-dovecot-sql.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf similarity index 100% rename from templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_02-dovecot-sql.conf rename to templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_dovecot-sql.conf