From 66aeda7f653cfb72731fe7ff2925d7291158500f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@debian.org>
Date: Fri, 25 Apr 2025 17:59:57 +0200
Subject: Port tests and documentation to Dovecot 2.4.

See https://doc.dovecot.org/main/installation/upgrade/2.3-to-2.4.html .
---
 tests/config/dovecot/imapd.conf | 7 ++-----
 tests/config/dovecot/lmtpd.conf | 4 +++-
 tests/config/dovecot/ssl.conf   | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'tests/config/dovecot')

diff --git a/tests/config/dovecot/imapd.conf b/tests/config/dovecot/imapd.conf
index 2b26451..6f456f6 100644
--- a/tests/config/dovecot/imapd.conf
+++ b/tests/config/dovecot/imapd.conf
@@ -1,8 +1,5 @@
-protocols = $protocols imap
-
-mail_plugins = $mail_plugins zlib
-protocol imap {
-    mail_plugins = $mail_plugins imap_zlib
+protocols {
+    imap = yes
 }
 
 service imap-login {
diff --git a/tests/config/dovecot/lmtpd.conf b/tests/config/dovecot/lmtpd.conf
index 6aa8365..23cdc1e 100644
--- a/tests/config/dovecot/lmtpd.conf
+++ b/tests/config/dovecot/lmtpd.conf
@@ -1,4 +1,6 @@
-protocols = $protocols lmtp
+protocols {
+    lmtp = yes
+}
 
 service lmtp {
     inet_listener lmtp {
diff --git a/tests/config/dovecot/ssl.conf b/tests/config/dovecot/ssl.conf
index 1f3a698..fd119cd 100644
--- a/tests/config/dovecot/ssl.conf
+++ b/tests/config/dovecot/ssl.conf
@@ -1,6 +1,6 @@
 ssl = required
-ssl_cert = <dovecot.rsa.crt
-ssl_key = <dovecot.rsa.key
-ssl_dh = <dhparams.pem
+ssl_server_cert_file = dovecot.rsa.crt
+ssl_server_key_file = dovecot.rsa.key
+ssl_server_dh_file = dhparams.pem
 ssl_min_protocol = TLSv1.2
 ssl_cipher_list = DEFAULT@SECLEVEL=2
-- 
cgit v1.2.3