From 26e8e4d6811b249a3b5c8a60a12aac8b698e6889 Mon Sep 17 00:00:00 2001 From: myve Date: Sun, 7 Sep 2025 03:40:13 +0000 Subject: [PATCH] revert 241675a18eec8b0dc5f1b8a6544cf3d560b0782d revert Dovecot 2.4 changes --- build/run/installer.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/run/installer.sh b/build/run/installer.sh index caf8854..aeefb15 100755 --- a/build/run/installer.sh +++ b/build/run/installer.sh @@ -182,7 +182,7 @@ tee -a /etc/dovecot/conf.d/10-auth.conf >/dev/null <<- '10-auth.conf' !include auth-sql.conf.ext disable_plaintext_auth = yes -auth_username_format = %{user | lower} +auth_username_format = %Lu auth_mechanisms = plain login auth_default_realm = {{MYVEMAIL_DOMAIN}} @@ -197,8 +197,8 @@ tee -a /etc/dovecot/dovecot-sql.conf.ext >/dev/null <<- 'dovecot' driver = mysql connect = host=localhost dbname={{MYVEMAIL_POSTFIXADMIN_DBNAME}} user={{MYVEMAIL_POSTFIXADMIN_DBUSER}} password={{MYVEMAIL_POSTFIXADMIN_DBPASS}} default_pass_scheme = ARGON2I -password_query = SELECT username AS user,password FROM mailbox WHERE username = '%{user}' AND active='1' -user_query = SELECT maildir, 600 AS uid, 600 AS gid FROM mailbox WHERE username = '%{user}' AND active='1' +password_query = SELECT username AS user,password FROM mailbox WHERE username = '%u' AND active='1' +user_query = SELECT maildir, 600 AS uid, 600 AS gid FROM mailbox WHERE username = '%u' AND active='1' iterate_query = SELECT username AS user FROM mailbox dovecot @@ -209,7 +209,7 @@ tee -a /etc/dovecot/conf.d/10-mail.conf >/dev/null <<- '10-mail.conf' mail_privileged_group = mail mail_location = maildir:~/Maildir -mail_home = /var/vmail/%{user | domain}/%{user | username}/ +mail_home = /var/vmail/%d/%n/ 10-mail.conf # 10-master.conf