From 4977d7c1d80ac0caf94914fbf9be8471d056c906 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 8 Sep 2024 02:10:41 +0200
Subject: IMAP: Adjust dovecot configuration to bullseye.

Provisioning /etc/dovecot/conf.d/*.conf is a pain on upgrade so we
consolidate that by reverting these files to the distro-provided ones
and shipping a single /etc/dovecot/conf.d/99-local.conf override
instead.
---
 roles/IMAP/tasks/imap.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'roles/IMAP/tasks/imap.yml')

diff --git a/roles/IMAP/tasks/imap.yml b/roles/IMAP/tasks/imap.yml
index 4a157af..c2bdca9 100644
--- a/roles/IMAP/tasks/imap.yml
+++ b/roles/IMAP/tasks/imap.yml
@@ -139,15 +139,6 @@
   register: r1
   with_items:
     - conf.d/10-auth.conf
-    - conf.d/10-mail.conf
-    - conf.d/10-ssl.conf
-    - conf.d/15-mailboxes.conf
-    # LDA is also used by LMTP
-    - conf.d/15-lda.conf
-    - conf.d/20-imap.conf
-    - conf.d/20-lmtp.conf
-    - conf.d/90-plugin.conf
-    - conf.d/90-sieve.conf
     - conf.d/auth-ldap.conf.ext
     - dovecot-ldap.conf.ext
     - dovecot-ldap-userdb.conf.ext
@@ -161,7 +152,16 @@
             mode=0644
   register: r2
   with_items:
-    - conf.d/10-master.conf
+    - conf.d/99-local.conf
+  notify:
+    - Restart Dovecot
+
+# TODO bookworm remove the below and inline the !include_try
+- name: Copy /etc/dovecot/ssl/config workaround
+  copy: src=etc/dovecot/ssl/config
+        dest=/etc/dovecot/ssl/config
+        owner=root group=root
+        mode=0600
   notify:
     - Restart Dovecot
 
-- 
cgit v1.2.3