dovecot: update to 2.4 #6692
Draft
dovecot: update to 2.4 #6692
+658
−417
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nice! Can you add |
cr3
reviewed
Dec 8, 2025
| !include_try /etc/dovecot/sni.conf | ||
| !include_try /etc/dovecot/sogo_trusted_ip.conf | ||
| !include_try /etc/dovecot/shared_namespace.conf | ||
| !include_try /etc/dovecot/conf.d/fts.conf |
cr3
reviewed
Dec 9, 2025
| driver = mysql | ||
| connect = "host=/var/run/mysqld/mysqld.sock dbname=${DBNAME} user=${DBUSER} password=${DBPASS}" | ||
| user_query = SELECT CONCAT(JSON_UNQUOTE(JSON_VALUE(attributes, '$.mailbox_format')), mailbox_path_prefix, '%d/%n/${MAILDIR_SUB}:VOLATILEDIR=/var/volatile/%u:INDEX=/var/vmail_index/%u') AS mail, '%s' AS protocol, 5000 AS uid, 5000 AS gid, concat('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%u' AND (active = '1' OR active = '2') | ||
| query = SELECT CONCAT(JSON_UNQUOTE(JSON_VALUE(attributes, '$.mailbox_format')), mailbox_path_prefix, '%{user | domain }}/%{user | username }/Maildir:VOLATILEDIR=/var/volatile/%{user}:INDEX=/var/vmail_index/%{user}') AS mail, '%{protocol}' AS protocol, 5000 AS uid, 5000 AS gid, concat('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%{user}' AND (active = '1' OR active = '2') |
There was a problem hiding this comment.
You seem to have an accidental double-brace here - see "}}".
cr3
reviewed
Dec 9, 2025
| function auth_password_verify(request, password) | ||
| request.domain = request.auth_user:match("@(.+)") or nil | ||
| if request.domain == nil then | ||
| return dovecot.auth.PASSDB_RESULT_USER_UNKNOWN, "No such user" |
There was a problem hiding this comment.
I think this return value, as well as the other return values, will return an error like Error: lua: passdb-lua: db-lua: auth_password_verify invalid return value (expected nil or table, got string). Instead, I think you should just return dovecot.auth.PASSDB_RESULT_USER_UNKNOWN without the string.
cr3
reviewed
Dec 9, 2025
| driver = mysql | ||
| connect = "host=/var/run/mysqld/mysqld.sock dbname=${DBNAME} user=${DBUSER} password=${DBPASS}" | ||
| user_query = SELECT CONCAT(JSON_UNQUOTE(JSON_VALUE(attributes, '$.mailbox_format')), mailbox_path_prefix, '%d/%n/${MAILDIR_SUB}:VOLATILEDIR=/var/volatile/%u:INDEX=/var/vmail_index/%u') AS mail, '%s' AS protocol, 5000 AS uid, 5000 AS gid, concat('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%u' AND (active = '1' OR active = '2') | ||
| query = SELECT CONCAT(JSON_UNQUOTE(JSON_VALUE(attributes, '$.mailbox_format')), mailbox_path_prefix, '%{user | domain }}/%{user | username }/Maildir:VOLATILEDIR=/var/volatile/%{user}:INDEX=/var/vmail_index/%{user}') AS mail, '%{protocol}' AS protocol, 5000 AS uid, 5000 AS gid, concat('*:bytes=', quota) AS quota_rule FROM mailbox WHERE username = '%{user}' AND (active = '1' OR active = '2') |
There was a problem hiding this comment.
Also, you probably want to keep ${MAILDIR_SUB} instead of hard-coding Maildir for backward compatibility, along with the corresponding change in data/conf/dovecot/conf.d/10-mail.conf
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution Guidelines
What does this PR include?
Short Description
This pull request introduces a major overhaul and modernization of the Dovecot configuration for the mail server. The changes include a migration to new-style configuration files, significant improvements to SQL and authentication integration, updated plugin and service management, and enhanced security defaults. The Dockerfile is also updated to use a newer Alpine base image. Below are the most important changes grouped by theme:
Configuration Modernization and Structure:
data/conf/dovecot/conf.d/, covering core, mail, SSL, SQL, storage, performance, authentication, userdb, and service definitions for improved clarity and maintainability. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11]Authentication and SQL Integration:
Plugin and Service Management:
quota_clone,mail_compress) and removed deprecated options, with conditional handling based on FTS settings.Security and Protocol Improvements:
Other Notable Changes:
These changes collectively bring the Dovecot setup up to date with current best practices, improve maintainability, and enhance both security and feature support.
Affected Containers
Did you run tests?
What did you tested?
WIP