Configuration fixes

modoboa_installer/scripts/dovecot.py

@@ -67,7 +67,8 @@ class Dovecot(base.Installer):
         files = self.per_version_config_files[version]
         if version == "2.4":
             files += [
-                f"conf.d/auth-sql-{self.dbengine}.conf.ext=conf.d/auth-sql.conf.ext"
+                f"conf.d/auth-sql-{self.dbengine}.conf.ext=conf.d/auth-sql.conf.ext",
+                f"conf.d/auth-master-{self.dbengine}.conf.ext=conf.d/auth-master.conf.ext",
             ]
         else:
             files += [
@@ -166,7 +167,8 @@ class Dovecot(base.Installer):
             "modoboa_2_2_or_greater": "" if self.modoboa_2_2_or_greater else "#",
             "not_modoboa_2_2_or_greater": "" if not self.modoboa_2_2_or_greater else "#",
             "do_move_spam_to_junk": "" if self.app_config["move_spam_to_junk"] else "#",
-            "oauth2_introspection_url": oauth2_introspection_url
+            "oauth2_introspection_url": oauth2_introspection_url,
+            "radicale_user": self.config.get("radicale", "user"),
         })
         return context
 

modoboa_installer/scripts/files/dovecot/2.4/conf.d/10-auth.conf

@@ -112,7 +112,7 @@ auth_mechanisms = plain login oauthbearer xoauth2
 # <https://doc.dovecot.org/latest/core/config/auth/userdb.html>
 
 #!include auth-deny.conf.ext
-#!include auth-master.conf.ext
+!include auth-master.conf.ext
 !include auth-oauth2.conf.ext
 
 #!include auth-system.conf.ext

modoboa_installer/scripts/files/dovecot/2.4/conf.d/10-master.conf.tpl

@@ -145,6 +145,13 @@ service auth {
     group = postfix
   }
 
+  %{radicale_enabled}unix_listener auth-radicale {
+  %{radicale_enabled}  mode = 0666
+  %{radicale_enabled}  user = %{radicale_user}
+  %{radicale_enabled}  group = %{radicale_user}
+  %{radicale_enabled}  type = auth-legacy
+  %{radicale_enabled}}
+
   # Auth process is run as this user.
   #user = $SET:default_internal_user
 }

modoboa_installer/scripts/files/dovecot/2.4/conf.d/20-imap.conf

@@ -99,8 +99,7 @@
 protocol imap {
   # Space separated list of plugins to load (default is global mail_plugins).
   mail_plugins {
-    imap_quota = yes
+    quota = yes
-    imap_sieve = yes
   }
 
   # Maximum number of IMAP connections allowed for a user from each IP address.

modoboa_installer/scripts/files/dovecot/2.4/conf.d/30-dict-server.conf.tpl

@@ -9,13 +9,18 @@
 # "proxy::<name>".
 
 dict_server {
+  pgsql %dbhost {
+    parameters {
+      port = %dbport
+      dbname = %modoboa_dbname
+      user = %modoboa_dbuser
+      password = %modoboa_dbpassword
+    }
+  }
   dict quota {
     driver = sql
     sql_driver = %db_driver
     hostname = %dbhost
-    dbname = %modoboa_dbname
-    user = %modoboa_dbuser
-    password = %modoboa_dbpassword
 
     dict_map priv/quota/storage {
       sql_table = admin_quota

modoboa_installer/scripts/files/dovecot/2.4/conf.d/auth-master-mysql.conf.ext.tpl

@@ -0,0 +1,28 @@
+# Authentication for master users. Included from auth.conf.
+
+# By adding master=yes setting inside a passdb you make the passdb a list
+# of "master users", who can log in as anyone else.
+# <https://doc.dovecot.org/latest/core/config/auth/master_users.html>
+
+# Example master user passdb using passwd-file. You can use any passdb though.
+#passdb master-passwd-file {
+#  driver = passwd-file
+#  master = yes
+#  passwd_file_path = /etc/dovecot/master-users
+#}
+
+sql_driver = %db_driver
+
+mysql %dbhost {
+  port = %dbport
+  dbname = %modoboa_dbname
+  user = %modoboa_dbuser
+  password = %modoboa_dbpassword
+}
+
+passdb db1 {
+  driver = sql
+  sql_query = SELECT email AS user, password FROM core_user WHERE email='%%{user}' and is_active=1 and master_user=1
+  master = yes
+  result_success = continue
+}

modoboa_installer/scripts/files/dovecot/2.4/conf.d/auth-master-postgres.conf.ext.tpl

@@ -0,0 +1,30 @@
+# Authentication for master users. Included from auth.conf.
+
+# By adding master=yes setting inside a passdb you make the passdb a list
+# of "master users", who can log in as anyone else.
+# <https://doc.dovecot.org/latest/core/config/auth/master_users.html>
+
+# Example master user passdb using passwd-file. You can use any passdb though.
+#passdb master-passwd-file {
+#  driver = passwd-file
+#  master = yes
+#  passwd_file_path = /etc/dovecot/master-users
+#}
+
+sql_driver = %db_driver
+
+pgsql %dbhost {
+  parameters {
+    port = %dbport
+    dbname = %modoboa_dbname
+    user = %modoboa_dbuser
+    password = %modoboa_dbpassword
+  }
+}
+
+passdb db1 {
+  driver = sql
+  sql_query = SELECT email AS user, password FROM core_user WHERE email='%%{user}' and is_active and master_user
+  master = yes
+  result_success = continue
+}

modoboa_installer/scripts/files/dovecot/2.4/conf.d/auth-sql-postgres.conf.ext.tpl

@@ -80,10 +80,12 @@ sql_driver = %db_driver
 # ...
 #}
 pgsql %dbhost {
+  parameters {
     port = %dbport
     dbname = %modoboa_dbname
     user = %modoboa_dbuser
     password = %modoboa_dbpassword
+  }
 }
 
 #passdb sql {