From: Timo Sirainen <tss@iki.fi>
Date: Tue, 9 Nov 2010 21:16:06 +0000 (+0000)
Subject: example-config: Moved include conf.d/*.conf last in dovecot.conf.
X-Git-Tag: 2.0.8~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1f2b44a1baabdcf9584c31bd7571b96edaa1e1d;p=thirdparty%2Fdovecot%2Fcore.git

example-config: Moved include conf.d/*.conf last in dovecot.conf.
This fixes problems where conf.d/ files try to modify settings in dovecot.conf,
especially managesieve adding itself to protocols setting.
---

diff --git a/doc/example-config/dovecot.conf b/doc/example-config/dovecot.conf
index 3a7707f610..4bc7978fdf 100644
--- a/doc/example-config/dovecot.conf
+++ b/doc/example-config/dovecot.conf
@@ -16,11 +16,6 @@
 # options. The paths listed here are for configure --prefix=/usr
 # --sysconfdir=/etc --localstatedir=/var
 
-# Most of the actual configuration gets included below. The filenames are
-# first sorted by their ASCII value and parsed in that order. The 00-prefixes
-# in filenames are intended to make it easier to understand the ordering.
-!include conf.d/*.conf
-
 # Protocols we want to be serving.
 #protocols = imap pop3 lmtp
 
@@ -77,6 +72,11 @@ dict {
   #expire = sqlite:/etc/dovecot/dovecot-dict-sql.conf.ext
 }
 
+# Most of the actual configuration gets included below. The filenames are
+# first sorted by their ASCII value and parsed in that order. The 00-prefixes
+# in filenames are intended to make it easier to understand the ordering.
+!include conf.d/*.conf
+
 # A config file can also tried to be included without giving an error if
 # it's not found:
 #!include_try /etc/dovecot/local.conf