From a8c529e4ddc7202912ae9ca4ddfb43f82779ff1f Mon Sep 17 00:00:00 2001
From: Xiao Pan <xyz@flylightning.xyz>
Date: Tue, 11 Nov 2025 01:39:25 +0000
Subject: dovecot 2.3 to 2.4 big config changes

https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html
---
 etc/dovecot/dovecot.conf | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'etc/dovecot')

diff --git a/etc/dovecot/dovecot.conf b/etc/dovecot/dovecot.conf
index e7d11a07..b4001ada 100644
--- a/etc/dovecot/dovecot.conf
+++ b/etc/dovecot/dovecot.conf
@@ -1,8 +1,23 @@
+# https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html#default-settings
+# needed for 2.4
+dovecot_config_version = 2.4.2
+dovecot_storage_version = 2.4.2
+
 # Edited from `doveconf -nP`, see https://doc.dovecot.org/2.3/configuration_manual/quick_configuration/#split-configuration-files
-mail_location = maildir:~/Mail:INBOX=~/Mail/Inbox:LAYOUT=fs
+# https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html#converted-settings
+# > mail_location setting & mail userdb field Split into multiple mail_* settings.
+mail_driver = maildir
+mail_path = ~/Mail
+# https://doc.dovecot.org/2.4.1/core/config/mail_location.html#mail_inbox_path
+mail_inbox_path = ~/Mail/Inbox
+# https://doc.dovecot.org/2.4.1/core/config/mailbox_formats/maildir.html#directory-layout
+# > use hierarchical directories, such as Maildir/folder/ Maildir/folder/subfolder/
+mailbox_list_layout = fs
 namespace inbox {
 	inbox = yes
-	location =
+	# https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html#converted-settings
+	# namespace { location } setting is changed in 2.4, it is kinda no need to
+	# so I just removed, not remove will error
 	mailbox Archive {
 		auto = subscribe
 		special_use = \Archive
@@ -29,7 +44,9 @@ namespace inbox {
 	}
 	prefix =
 }
-passdb {
+# https://doc.dovecot.org/2.4.1/installation/upgrade/2.3-to-2.4.html#passdb-userdb-section-naming
+# > passdb and userdb sections now require a name
+passdb some_name {
 	driver = pam
 }
 service auth {
@@ -40,9 +57,16 @@ service auth {
 	}
 }
 ssl = required
-ssl_cert = </etc/postfix/flylightning.pem
-ssl_dh = </etc/dovecot/dh.pem
-ssl_key = </etc/postfix/flylightning.key
-userdb {
+# https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html#converted-settings
+# ssl_cert, ssl_dh, ssl_key name changed
+ssl_server_cert_file = /etc/postfix/flylightning.pem
+ssl_server_dh_file = /etc/dovecot/dh.pem
+ssl_server_key_file = /etc/postfix/flylightning.key
+userdb some_name {
 	driver = passwd
 }
+# https://doc.dovecot.org/2.4.2/installation/upgrade/2.3-to-2.4.html#default-settings
+# > No protocols are enabled by default.
+# In the past, imap pop3 lmtp are enabled by default. Now none I only need
+# imaps, so I put imap here
+protocols = imap
-- 
cgit v1.2.3-70-g09d2