From 8e87df7a5e0e48b8900aa039448677bea5f956d5 Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Sun, 3 Jan 2021 20:17:39 +0100 Subject: [PATCH] Update templates --- .../etc/dovecot/conf.d/10-logging.conf.j2 | 17 ++++-- templates/etc/dovecot/conf.d/10-mail.conf.j2 | 56 ++++++++++++++++++- templates/etc/dovecot/conf.d/10-ssl.conf.j2 | 9 ++- 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/templates/etc/dovecot/conf.d/10-logging.conf.j2 b/templates/etc/dovecot/conf.d/10-logging.conf.j2 index 5f2c25c..6313c18 100644 --- a/templates/etc/dovecot/conf.d/10-logging.conf.j2 +++ b/templates/etc/dovecot/conf.d/10-logging.conf.j2 @@ -74,11 +74,16 @@ plugin { # possible variables you can use. #mail_log_prefix = "%s(%u): " -# Format to use for logging mail deliveries. You can use variables: +# Format to use for logging mail deliveries: # %$ - Delivery status message (e.g. "saved to INBOX") -# %m - Message-ID -# %s - Subject -# %f - From address -# %p - Physical size -# %w - Virtual size +# %m / %{msgid} - Message-ID +# %s / %{subject} - Subject +# %f / %{from} - From address +# %p / %{size} - Physical size +# %w / %{vsize} - Virtual size +# %e / %{from_envelope} - MAIL FROM envelope +# %{to_envelope} - RCPT TO envelope +# %{delivery_time} - How many milliseconds it took to deliver the mail +# %{session_time} - How long LMTP session took, not including delivery_time +# %{storage_id} - Backend-specific ID for mail, e.g. Maildir filename #deliver_log_format = msgid=%m: %$ diff --git a/templates/etc/dovecot/conf.d/10-mail.conf.j2 b/templates/etc/dovecot/conf.d/10-mail.conf.j2 index a375f23..a16a40d 100644 --- a/templates/etc/dovecot/conf.d/10-mail.conf.j2 +++ b/templates/etc/dovecot/conf.d/10-mail.conf.j2 @@ -75,6 +75,8 @@ namespace inbox { # Namespace handles its own subscriptions. If set to "no", the parent # namespace handles them (empty prefix should always have this as "yes") #subscriptions = yes + + # See 15-mailboxes.conf for definitions of special mailboxes. } # Example shared namespace configuration @@ -124,10 +126,22 @@ namespace inbox { # or ~user/. #mail_full_filesystem_access = no -# Dictionary for key=value mailbox attributes. Currently used by URLAUTH, but -# soon intended to be used by METADATA as well. +# Dictionary for key=value mailbox attributes. This is used for example by +# URLAUTH and METADATA extensions. #mail_attribute_dict = +# A comment or note that is associated with the server. This value is +# accessible for authenticated users through the IMAP METADATA server +# entry "/shared/comment". +#mail_server_comment = "" + +# Indicates a method for contacting the server administrator. According to +# RFC 5464, this value MUST be a URI (e.g., a mailto: or tel: URL), but that +# is currently not enforced. Use for example mailto:admin@example.com. This +# value is accessible for authenticated users through the IMAP METADATA server +# entry "/shared/admin". +#mail_server_admin = + ## ## Mail processes ## @@ -215,6 +229,15 @@ first_valid_uid = 1000 # also required for IMAP NOTIFY extension to be enabled. #mailbox_list_index = no +# Trust mailbox list index to be up-to-date. This reduces disk I/O at the cost +# of potentially returning out-of-date results after e.g. server crashes. +# The results will be automatically fixed once the folders are opened. +#mailbox_list_index_very_dirty_syncs = yes + +# Should INBOX be kept up-to-date in the mailbox list index? By default it's +# not, because most of the mailbox accesses will open INBOX anyway. +#mailbox_list_index_include_inbox = no + # The minimum number of mails in a mailbox before updates are done to cache # file. This allows optimizing Dovecot's behavior to do less disk writes at # the cost of more disk reads. @@ -222,7 +245,7 @@ first_valid_uid = 1000 # When IDLE command is running, mailbox is checked once in a while to see if # there are any new mails or other changes. This setting defines the minimum -# time to wait between those checks. Dovecot can also use dnotify, inotify and +# time to wait between those checks. Dovecot can also use inotify and # kqueue to find out immediately when changes occur. #mailbox_idle_check_interval = 30 secs @@ -241,6 +264,19 @@ first_valid_uid = 1000 # These should exist only after Dovecot dies in the middle of saving mails. #mail_temp_scan_interval = 1w +# How many slow mail accesses sorting can perform before it returns failure. +# With IMAP the reply is: NO [LIMIT] Requested sort would have taken too long. +# The untagged SORT reply is still returned, but it's likely not correct. +#mail_sort_max_read_count = 0 + +protocol !indexer-worker { + # If folder vsize calculation requires opening more than this many mails from + # disk (i.e. mail sizes aren't in cache already), return failure and finish + # the calculation via indexer process. Disabled by default. This setting must + # be 0 for indexer-worker processes. + #mail_vsize_bg_after_count = 0 +} + ## ## Maildir-specific settings ## @@ -266,6 +302,10 @@ first_valid_uid = 1000 # broken size. The performance hit for enabling this is very small. #maildir_broken_filename_sizes = no +# Always move mails from new/ directory to cur/, even when the \Recent flags +# aren't being reset. +#maildir_empty_new = no + ## ## mbox-specific settings ## @@ -367,3 +407,13 @@ mbox_write_locks = fcntl # variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. # Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits #mail_attachment_hash = %{sha1} + +# Settings to control adding $HasAttachment or $HasNoAttachment keywords. +# By default, all MIME parts with Content-Disposition=attachment, or inlines +# with filename parameter are consired attachments. +# add-flags-on-save - Add the keywords when saving new mails. +# content-type=type or !type - Include/exclude content type. Excluding will +# never consider the matched MIME part as attachment. Including will only +# negate an exclusion (e.g. content-type=!foo/* content-type=foo/bar). +# exclude-inlined - Exclude any Content-Disposition=inline MIME part. +#mail_attachment_detection_options = diff --git a/templates/etc/dovecot/conf.d/10-ssl.conf.j2 b/templates/etc/dovecot/conf.d/10-ssl.conf.j2 index 76fbc1a..31485ed 100644 --- a/templates/etc/dovecot/conf.d/10-ssl.conf.j2 +++ b/templates/etc/dovecot/conf.d/10-ssl.conf.j2 @@ -25,7 +25,7 @@ ssl_key =