From 6d7dd9f578fe480547327a820a5854cce0bb0294 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Mon, 26 Sep 2022 18:34:47 +0200
Subject: [PATCH 1/3] Add modoboa user to dovecot group upon install

---
 modoboa_installer/scripts/dovecot.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py
index f015a7a..4ef094d 100644
--- a/modoboa_installer/scripts/dovecot.py
+++ b/modoboa_installer/scripts/dovecot.py
@@ -110,6 +110,11 @@ class Dovecot(base.Installer):
             self.config.get("dovecot", "mailboxes_owner"),
             'dovecot'
         )
+        # Add modoboa to dovecot group for doveadm commands.
+        system.add_user_to_group(
+            self.config.get("modoboa", "user"),
+            'dovecot'
+        )
 
     def restart_daemon(self):
         """Restart daemon process.

From 82c4b1033a1ec44d0051abefca570517e107470c Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Tue, 27 Sep 2022 09:32:55 +0200
Subject: [PATCH 2/3] Better fix

---
 modoboa_installer/scripts/dovecot.py              |  5 -----
 .../files/dovecot/conf.d/10-master.conf.tpl       | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py
index 4ef094d..f015a7a 100644
--- a/modoboa_installer/scripts/dovecot.py
+++ b/modoboa_installer/scripts/dovecot.py
@@ -110,11 +110,6 @@ class Dovecot(base.Installer):
             self.config.get("dovecot", "mailboxes_owner"),
             'dovecot'
         )
-        # Add modoboa to dovecot group for doveadm commands.
-        system.add_user_to_group(
-            self.config.get("modoboa", "user"),
-            'dovecot'
-        )
 
     def restart_daemon(self):
         """Restart daemon process.
diff --git a/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl b/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
index 6c25b8d..eef33a7 100644
--- a/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
+++ b/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
@@ -89,6 +89,21 @@ service postlogin {
   }
 }
 
+service stats {
+  # To allow modoboa to access availible cipher list.
+  unix_listener stats-reader {
+    user = vmail
+    group = vmail
+    mode = 0660
+  }
+
+  unix_listener stats-writer {
+    user = vmail
+    group = vmail
+    mode = 0660
+  }
+}
+
 service auth {
   # auth_socket_path points to this userdb socket by default. It's typically
   # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have

From fe6dc8279673bf4410e8415b3d5312a2e06b0682 Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Mon, 3 Oct 2022 15:13:53 +0200
Subject: [PATCH 3/3] fixed typo

---
 .../scripts/files/dovecot/conf.d/10-master.conf.tpl             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl b/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
index eef33a7..5552396 100644
--- a/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
+++ b/modoboa_installer/scripts/files/dovecot/conf.d/10-master.conf.tpl
@@ -90,7 +90,7 @@ service postlogin {
 }
 
 service stats {
-  # To allow modoboa to access availible cipher list.
+  # To allow modoboa to access available cipher list.
   unix_listener stats-reader {
     user = vmail
     group = vmail