From 133eb9bc2e23de66cc9f623f5fad5813f00021b4 Mon Sep 17 00:00:00 2001 From: Brennan Kinney <5098581+polarathene@users.noreply.github.com> Date: Sun, 15 Jan 2023 18:33:31 +1300 Subject: [PATCH] tests(refactor): `mail_lmtp_ip.bats` (#3004) * chore: Drop ENV `ENABLE_POSTFIX_VIRTUAL_TRANSPORT` * tests(chore): Remove redundant `dovecot-lmtp` config None of this is needed. Only relevant change is changing the LMTP service listener for Dovecot and that can be delegated to `user-patches.sh`. * tests(refactor): Use `user-patches.sh` instead of replacing config file The only relevant changes in `test/config/dovecot-lmtp` regarding LMTP was: - `/etc/dovecot/dovecot.conf` (`protocols = imap lmtp`) and `/etc/dovecot/protocols.d/` (`protocols = $protocols lmtp`). - `conf.d/10-master.conf` only changed the LMTP service listener from a unix socket to TCP on port 24 (_this was the only change required for the test to pass_). None of those configs are required as: - `protocols = imap pop3 lmtp` [is the upstream default](https://doc.dovecot.org/settings/core/#core_setting-protocols), no need to add `lmtp`. - The LMTP service listener is now configured for the test with `user-patches.sh`. * tests(refactor): `mail_lmtp_ip.bats` - Converted to new testing conventions and common container helpers. - `ENABLE_POSTFIX_VIRTUAL_TRANSPORT` was not relevant, dropped. - Revised test cases, logic remains the same. - Large custom config used was not documented and doesn't appear to serve any purpose. Simplified by replacing with a single modification with `user-patches.sh`. - Added some additional comments for context of test and improvements that could be made. * tests(chore): Adjust comments The comment from `mail_hostname` provides no valid context, it was likely copied over from `tests.bats` in Oct 2020 by accident. The email sent is just for testing, nothing relevant to LMTP. --- Added additional comment for test to reference extra information from. * tests(chore): Update similar log line matching Extracts out the match pattern and formatting commands into separate vars (reduces horizontal scrolling), and includes extra docs about what the matched line should be expected to look like. --- docs/content/config/advanced/auth-ldap.md | 12 +- docs/content/config/environment.md | 14 +- mailserver.env | 11 +- target/scripts/start-mailserver.sh | 2 +- target/scripts/startup/setup-stack.sh | 11 +- test/config/dovecot-lmtp/README | 2 - test/config/dovecot-lmtp/conf.d/10-auth.conf | 128 ------ .../dovecot-lmtp/conf.d/10-director.conf | 61 --- .../dovecot-lmtp/conf.d/10-logging.conf | 84 ---- test/config/dovecot-lmtp/conf.d/10-mail.conf | 374 ------------------ .../config/dovecot-lmtp/conf.d/10-master.conf | 128 ------ test/config/dovecot-lmtp/conf.d/10-ssl.conf | 61 --- .../dovecot-lmtp/conf.d/10-tcpwrapper.conf | 14 - test/config/dovecot-lmtp/conf.d/15-lda.conf | 48 --- .../dovecot-lmtp/conf.d/15-mailboxes.conf | 50 --- test/config/dovecot-lmtp/conf.d/20-imap.conf | 61 --- test/config/dovecot-lmtp/conf.d/20-lmtp.conf | 19 - .../dovecot-lmtp/conf.d/20-managesieve.conf | 73 ---- test/config/dovecot-lmtp/conf.d/20-pop3.conf | 98 ----- test/config/dovecot-lmtp/conf.d/90-acl.conf | 19 - .../config/dovecot-lmtp/conf.d/90-plugin.conf | 11 - test/config/dovecot-lmtp/conf.d/90-quota.conf | 80 ---- test/config/dovecot-lmtp/conf.d/90-sieve.conf | 105 ----- .../conf.d/auth-checkpassword.conf.ext | 21 - .../dovecot-lmtp/conf.d/auth-deny.conf.ext | 15 - .../dovecot-lmtp/conf.d/auth-ldap.conf.ext | 33 -- .../dovecot-lmtp/conf.d/auth-master.conf.ext | 16 - .../conf.d/auth-passwdfile.conf.ext | 19 - .../dovecot-lmtp/conf.d/auth-passwdfile.inc | 19 - .../dovecot-lmtp/conf.d/auth-sql.conf.ext | 30 -- .../dovecot-lmtp/conf.d/auth-static.conf.ext | 24 -- .../dovecot-lmtp/conf.d/auth-system.conf.ext | 74 ---- .../conf.d/auth-vpopmail.conf.ext | 17 - .../dovecot-lmtp/dovecot-dict-sql.conf.ext | 41 -- .../config/dovecot-lmtp/dovecot-ldap.conf.ext | 11 - test/config/dovecot-lmtp/dovecot-sql.conf.ext | 139 ------- test/config/dovecot-lmtp/dovecot.conf | 105 ----- test/config/dovecot-lmtp/local.conf | 1 - .../dovecot-lmtp/protocols.d/imapd.protocol | 1 - .../dovecot-lmtp/protocols.d/lmtpd.protocol | 1 - .../protocols.d/managesieved.protocol.disab | 1 - .../protocols.d/pop3d.protocol.disab | 1 - test/config/dovecot-lmtp/user-patches.sh | 27 ++ test/tests/parallel/set3/smtp-delivery.bats | 6 +- test/tests/serial/mail_hostname.bats | 1 - test/tests/serial/mail_lmtp_ip.bats | 69 ++-- 46 files changed, 82 insertions(+), 2056 deletions(-) delete mode 100644 test/config/dovecot-lmtp/README delete mode 100644 test/config/dovecot-lmtp/conf.d/10-auth.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-director.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-logging.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-mail.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-master.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-ssl.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/10-tcpwrapper.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/15-lda.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/15-mailboxes.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/20-imap.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/20-lmtp.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/20-managesieve.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/20-pop3.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/90-acl.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/90-plugin.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/90-quota.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/90-sieve.conf delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-checkpassword.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-deny.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-ldap.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-master.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-passwdfile.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-passwdfile.inc delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-sql.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-static.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-system.conf.ext delete mode 100644 test/config/dovecot-lmtp/conf.d/auth-vpopmail.conf.ext delete mode 100644 test/config/dovecot-lmtp/dovecot-dict-sql.conf.ext delete mode 100644 test/config/dovecot-lmtp/dovecot-ldap.conf.ext delete mode 100644 test/config/dovecot-lmtp/dovecot-sql.conf.ext delete mode 100644 test/config/dovecot-lmtp/dovecot.conf delete mode 100644 test/config/dovecot-lmtp/local.conf delete mode 100644 test/config/dovecot-lmtp/protocols.d/imapd.protocol delete mode 100644 test/config/dovecot-lmtp/protocols.d/lmtpd.protocol delete mode 100644 test/config/dovecot-lmtp/protocols.d/managesieved.protocol.disab delete mode 100644 test/config/dovecot-lmtp/protocols.d/pop3d.protocol.disab create mode 100644 test/config/dovecot-lmtp/user-patches.sh diff --git a/docs/content/config/advanced/auth-ldap.md b/docs/content/config/advanced/auth-ldap.md index bee59208..822145cf 100644 --- a/docs/content/config/advanced/auth-ldap.md +++ b/docs/content/config/advanced/auth-ldap.md @@ -189,13 +189,11 @@ The changes on the configurations necessary to work with Active Directory (**onl ???+ example "Basic Setup" ```yaml - version: '3.8' services: mailserver: image: docker.io/mailserver/docker-mailserver:latest container_name: mailserver - hostname: mail - domainname: example.com + hostname: mail.example.com ports: - "25:25" @@ -243,7 +241,6 @@ The changes on the configurations necessary to work with Active Directory (**onl - SASLAUTHD_LDAP_FILTER=(&(mail=%U@example.org)(objectClass=inetOrgPerson)) # <<< SASL LDAP Authentication - - ONE_DIR=1 - SSL_TYPE=letsencrypt - PERMIT_DOCKER=host @@ -254,14 +251,11 @@ The changes on the configurations necessary to work with Active Directory (**onl ??? example "Kopano / Zarafa" ```yaml - version: '3.8' - services: mailserver: image: docker.io/mailserver/docker-mailserver:latest container_name: mailserver - hostname: mail - domainname: example.com + hostname: mail.example.com ports: - "25:25" @@ -303,11 +297,9 @@ The changes on the configurations necessary to work with Active Directory (**onl # <<< Postfix Ldap Integration # >>> Kopano Integration - - ENABLE_POSTFIX_VIRTUAL_TRANSPORT=1 - POSTFIX_DAGENT=lmtp:kopano:2003 # <<< Kopano Integration - - ONE_DIR=1 - SSL_TYPE=letsencrypt - PERMIT_DOCKER=host diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md index 293fe861..600fd434 100644 --- a/docs/content/config/environment.md +++ b/docs/content/config/environment.md @@ -197,22 +197,16 @@ Set how many days a virusmail will stay on the server before being deleted - **empty** => 7 days -##### ENABLE_POSTFIX_VIRTUAL_TRANSPORT - -This Option is activating the Usage of POSTFIX_DAGENT to specify a ltmp client different from default dovecot socket. - -- **empty** => disabled -- 1 => enabled - ##### POSTFIX_DAGENT -Enabled by ENABLE_POSTFIX_VIRTUAL_TRANSPORT. Specify the final delivery of postfix +Configure Postfix `virtual_transport` to deliver mail to a different LMTP client (_default is a unix socket to dovecot_). -- **empty**: fail +Provide any valid URI. Examples: + +- **empty** => `lmtp:unix:/var/run/dovecot/lmtp` (default, configured in Postfix `main.cf`) - `lmtp:unix:private/dovecot-lmtp` (use socket) - `lmtps:inet::` (secure lmtp with starttls) - `lmtp::2003` (use kopano as mailstore) -- etc. ##### POSTFIX\_MAILBOX\_SIZE\_LIMIT diff --git a/mailserver.env b/mailserver.env index 85e134f9..afc19137 100644 --- a/mailserver.env +++ b/mailserver.env @@ -172,18 +172,13 @@ SSL_ALT_KEY_PATH= # empty => 7 days VIRUSMAILS_DELETE_DELAY= -# This Option is activating the Usage of POSTFIX_DAGENT to specify a lmtp client different from default dovecot socket. -# empty => disabled -# 1 => enabled -ENABLE_POSTFIX_VIRTUAL_TRANSPORT= - -# Enabled by ENABLE_POSTFIX_VIRTUAL_TRANSPORT. Specify the final delivery of postfix +# Configure Postfix `virtual_transport` to deliver mail to a different LMTP client (default is a dovecot socket). +# Provide any valid URI. Examples: # -# empty => fail +# empty => `lmtp:unix:/var/run/dovecot/lmtp` (default, configured in Postfix main.cf) # `lmtp:unix:private/dovecot-lmtp` (use socket) # `lmtps:inet::` (secure lmtp with starttls) # `lmtp::2003` (use kopano as mailstore) -# etc. POSTFIX_DAGENT= # Set the mailbox size limit for all users. If set to zero, the size will be unlimited (default). diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh index c8430c0e..66ac69e0 100755 --- a/target/scripts/start-mailserver.sh +++ b/target/scripts/start-mailserver.sh @@ -138,7 +138,7 @@ function _register_functions _register_setup_function '_setup_postfix_access_control' _register_setup_function '_setup_postfix_relay_hosts' - [[ ${ENABLE_POSTFIX_VIRTUAL_TRANSPORT:-0} -eq 1 ]] && _register_setup_function '_setup_postfix_virtual_transport' + [[ -n ${POSTFIX_DAGENT} ]] && _register_setup_function '_setup_postfix_virtual_transport' _register_setup_function '_setup_postfix_override_configuration' _register_setup_function '_setup_logrotate' diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh index 26157716..f560e09d 100644 --- a/target/scripts/startup/setup-stack.sh +++ b/target/scripts/startup/setup-stack.sh @@ -737,17 +737,10 @@ function _setup_docker_permit esac } -# Requires ENABLE_POSTFIX_VIRTUAL_TRANSPORT=1 function _setup_postfix_virtual_transport { - _log 'trace' 'Setting up Postfix virtual transport' - - if [[ -z ${POSTFIX_DAGENT} ]] - then - dms_panic__no_env 'POSTFIX_DAGENT' 'Postfix Setup [virtual_transport]' - return 1 - fi - + _log 'trace' "Changing Postfix virtual transport to '${POSTFIX_DAGENT}'" + # Default value in main.cf should be 'lmtp:unix:/var/run/dovecot/lmtp' postconf "virtual_transport = ${POSTFIX_DAGENT}" } diff --git a/test/config/dovecot-lmtp/README b/test/config/dovecot-lmtp/README deleted file mode 100644 index 9dcc22ac..00000000 --- a/test/config/dovecot-lmtp/README +++ /dev/null @@ -1,2 +0,0 @@ -Configuration files go to this directory. See example configuration files in -/usr/share/doc/dovecot-core/example-config/ diff --git a/test/config/dovecot-lmtp/conf.d/10-auth.conf b/test/config/dovecot-lmtp/conf.d/10-auth.conf deleted file mode 100644 index 19526cd6..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-auth.conf +++ /dev/null @@ -1,128 +0,0 @@ -## -## Authentication processes -## - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP -# matches the local IP (ie. you're connecting from the same computer), the -# connection is considered secure and plaintext authentication is allowed. -# See also ssl=required setting. -#disable_plaintext_auth = yes - -# Authentication cache size (e.g. 10M). 0 means it's disabled. Note that -# bsdauth, PAM and vpopmail require cache_key to be set for caching to be used. -#auth_cache_size = 0 -# Time to live for cached data. After TTL expires the cached record is no -# longer used, *except* if the main database lookup returns internal failure. -# We also try to handle password changes automatically: If user's previous -# authentication was successful, but this one wasn't, the cache isn't used. -# For now this works only with plaintext authentication. -#auth_cache_ttl = 1 hour -# TTL for negative hits (user not found, password mismatch). -# 0 disables caching them completely. -#auth_cache_negative_ttl = 1 hour - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username formatting before it's looked up from databases. You can use -# the standard variables here, eg. %Lu would lowercase the username, %n would -# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into -# "-AT-". This translation is done after auth_username_translation changes. -#auth_username_format = %Lu - -# If you want to allow master users to log in by specifying the master -# username within the normal username string (ie. not using SASL mechanism's -# support for it), you can specify the separator character here. The format -# is then . UW-IMAP uses "*" as the -# separator, so that could be a good choice. -#auth_master_user_separator = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Host name to use in GSSAPI principal names. The default is to use the -# name returned by gethostname(). Use "$ALL" (with quotes) to allow all keytab -# entries. -#auth_gssapi_hostname = - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. You may need to change -# the auth service to run as root to be able to read this file. -#auth_krb5_keytab = - -# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -# ntlm_auth helper. -#auth_use_winbind = no - -# Path for Samba's ntlm_auth helper binary. -#auth_winbind_helper_path = /usr/bin/ntlm_auth - -# Time to delay before replying to failed authentications. -#auth_failure_delay = 2 secs - -# Require a valid SSL client certificate or the authentication fails. -#auth_ssl_require_client_cert = no - -# Take the username from client's SSL certificate, using -# X509_NAME_get_text_by_NID() which returns the subject's DN's -# CommonName. -#auth_ssl_username_from_cert = no - -# Space separated list of wanted authentication mechanisms: -# plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey -# gss-spnego -# NOTE: See also disable_plaintext_auth setting. -auth_mechanisms = plain login - -## -## Password and user databases -## - -# -# Password database is used to verify user's password (and nothing more). -# You can have multiple passdbs and userdbs. This is useful if you want to -# allow both system users (/etc/passwd) and virtual users to login without -# duplicating the system users into virtual database. -# -# -# -# User database specifies where mails are located and what user/group IDs -# own them. For single-UID configuration use "static" userdb. -# -# - -#!include auth-deny.conf.ext -#!include auth-master.conf.ext - -#!include auth-system.conf.ext -#!include auth-sql.conf.ext -######!include auth-ldap.conf.ext -!include auth-passwdfile.inc -#!include auth-checkpassword.conf.ext -#!include auth-vpopmail.conf.ext -#!include auth-static.conf.ext diff --git a/test/config/dovecot-lmtp/conf.d/10-director.conf b/test/config/dovecot-lmtp/conf.d/10-director.conf deleted file mode 100644 index 5eeb5d68..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-director.conf +++ /dev/null @@ -1,61 +0,0 @@ -## -## Director-specific settings. -## - -# Director can be used by Dovecot proxy to keep a temporary user -> mail server -# mapping. As long as user has simultaneous connections, the user is always -# redirected to the same server. Each proxy server is running its own director -# process, and the directors are communicating the state to each others. -# Directors are mainly useful with NFS-like setups. - -# List of IPs or hostnames to all director servers, including ourself. -# Ports can be specified as ip:port. The default port is the same as -# what director service's inet_listener is using. -#director_servers = - -# List of IPs or hostnames to all backend mail servers. Ranges are allowed -# too, like 10.0.0.10-10.0.0.30. -#director_mail_servers = - -# How long to redirect users to a specific server after it no longer has -# any connections. -#director_user_expire = 15 min - -# TCP/IP port that accepts doveadm connections (instead of director connections) -# If you enable this, you'll also need to add inet_listener for the port. -#director_doveadm_port = 0 - -# How the username is translated before being hashed. Useful values include -# %Ln if user can log in with or without @domain, %Ld if mailboxes are shared -# within domain. -#director_username_hash = %Lu - -# To enable director service, uncomment the modes and assign a port. -service director { - unix_listener login/director { - #mode = 0666 - } - fifo_listener login/proxy-notify { - #mode = 0666 - } - unix_listener director-userdb { - #mode = 0600 - } - inet_listener { - #port = - } -} - -# Enable director for the wanted login services by telling them to -# connect to director socket instead of the default login socket: -service imap-login { - #executable = imap-login director -} -service pop3-login { - #executable = pop3-login director -} - -# Enable director for LMTP proxying: -protocol lmtp { - #auth_socket_path = director-userdb -} diff --git a/test/config/dovecot-lmtp/conf.d/10-logging.conf b/test/config/dovecot-lmtp/conf.d/10-logging.conf deleted file mode 100644 index 0dbf97dd..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-logging.conf +++ /dev/null @@ -1,84 +0,0 @@ -## -## Log destination. -## - -# Log file to use for error messages. "syslog" logs to syslog, -# /dev/stderr logs to stderr. -#log_path = syslog - -# Log file to use for informational messages. Defaults to log_path. -#info_log_path = -# Log file to use for debug messages. Defaults to info_log_path. -#debug_log_path = - -# Syslog facility to use if you're logging to syslog. Usually if you don't -# want to use "mail", you'll use local0..local7. Also other standard -# facilities are supported. -#syslog_facility = mail - -## -## Logging verbosity and debugging. -## - -# Log unsuccessful authentication attempts and the reasons why they failed. -auth_verbose = yes - -# In case of password mismatches, log the attempted password. Valid values are -# no, plain and sha1. sha1 can be useful for detecting brute force password -# attempts vs. user simply trying the same password over and over again. -# You can also truncate the value to n chars by appending ":n" (e.g. sha1:6). -auth_verbose_passwords = sha1:6 - -# Even more verbose logging for debugging purposes. Shows for example SQL -# queries. -#auth_debug = no - -# In case of password mismatches, log the passwords and used scheme so the -# problem can be debugged. Enabling this also enables auth_debug. -#auth_debug_passwords = no - -# Enable mail process debugging. This can help you figure out why Dovecot -# isn't finding your mails. -#mail_debug = no - -# Show protocol level SSL errors. -verbose_ssl = no - -# mail_log plugin provides more event logging for mail processes. -plugin { - # Events to log. Also available: flag_change append - #mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename - # Available fields: uid, box, msgid, from, subject, size, vsize, flags - # size and vsize are available only for expunge and copy events. - #mail_log_fields = uid box msgid size -} - -## -## Log formatting. -## - -# Prefix for each line written to log file. % codes are in strftime(3) -# format. -#log_timestamp = "%b %d %H:%M:%S " - -# Space-separated list of elements we want to log. The elements which have -# a non-empty variable value are joined together to form a comma-separated -# string. -#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l mpid=%e %c - -# Login log format. %s contains login_log_format_elements string, %$ contains -# the data we want to log. -#login_log_format = %$: %s - -# Log prefix for mail processes. See doc/wiki/Variables.txt for list of -# possible variables you can use. -#mail_log_prefix = "%s(%u): " - -# Format to use for logging mail deliveries. You can use variables: -# %$ - Delivery status message (e.g. "saved to INBOX") -# %m - Message-ID -# %s - Subject -# %f - From address -# %p - Physical size -# %w - Virtual size -#deliver_log_format = msgid=%m: %$ diff --git a/test/config/dovecot-lmtp/conf.d/10-mail.conf b/test/config/dovecot-lmtp/conf.d/10-mail.conf deleted file mode 100644 index 57899ac2..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-mail.conf +++ /dev/null @@ -1,374 +0,0 @@ -## -## Mailbox locations and namespaces -## - -# Location for users' mailboxes. The default is empty, which means that Dovecot -# tries to find the mailboxes automatically. This won't work if the user -# doesn't yet have any mail, so you should explicitly tell Dovecot the full -# location. -# -# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u) -# isn't enough. You'll also need to tell Dovecot where the other mailboxes are -# kept. This is called the "root mail directory", and it must be the first -# path given in the mail_location setting. -# -# There are a few special variables you can use, eg.: -# -# %u - username -# %n - user part in user@domain, same as %u if there's no domain -# %d - domain part in user@domain, empty if there's no domain -# %h - home directory -# -# See doc/wiki/Variables.txt for full list. Some examples: -# -# mail_location = maildir:~/Maildir -# mail_location = mbox:~/mail:INBOX=/var/mail/%u -# mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n -# -# -# -mail_location = maildir:/var/mail/%d/%n - -# If you need to set multiple mailbox locations or want to change default -# namespace settings, you can do it by defining namespace sections. -# -# You can have private, shared and public namespaces. Private namespaces -# are for user's personal mails. Shared namespaces are for accessing other -# users' mailboxes that have been shared. Public namespaces are for shared -# mailboxes that are managed by sysadmin. If you create any shared or public -# namespaces you'll typically want to enable ACL plugin also, otherwise all -# users can access all the shared mailboxes, assuming they have permissions -# on filesystem level to do so. -namespace inbox { - # Namespace type: private, shared or public - #type = private - - # Hierarchy separator to use. You should use the same separator for all - # namespaces or some clients get confused. '/' is usually a good one. - # The default however depends on the underlying mail storage format. - #separator = - - # Prefix required to access this namespace. This needs to be different for - # all namespaces. For example "Public/". - #prefix = - - # Physical location of the mailbox. This is in same format as - # mail_location, which is also the default for it. - #location = - - # There can be only one INBOX, and this setting defines which namespace - # has it. - inbox = yes - - # If namespace is hidden, it's not advertised to clients via NAMESPACE - # extension. You'll most likely also want to set list=no. This is mostly - # useful when converting from another server with different namespaces which - # you want to deprecate but still keep working. For example you can create - # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/". - #hidden = no - - # Show the mailboxes under this namespace with LIST command. This makes the - # namespace visible for clients that don't support NAMESPACE extension. - # "children" value lists child mailboxes, but hides the namespace prefix. - #list = yes - - # Namespace handles its own subscriptions. If set to "no", the parent - # namespace handles them (empty prefix should always have this as "yes") - #subscriptions = yes -} - -# Example shared namespace configuration -#namespace { - #type = shared - #separator = / - - # Mailboxes are visible under "shared/user@domain/" - # %%n, %%d and %%u are expanded to the destination user. - #prefix = shared/%%u/ - - # Mail location for other users' mailboxes. Note that %variables and ~/ - # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the - # destination user's data. - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u - - # Use the default namespace for saving subscriptions. - #subscriptions = no - - # List the shared/ namespace only if there are visible shared mailboxes. - #list = children -#} -# Should shared INBOX be visible as "shared/user" or "shared/user/INBOX"? -#mail_shared_explicit_inbox = no - -# System user and group used to access mails. If you use multiple, userdb -# can override these by returning uid or gid fields. You can use either numbers -# or names. -#mail_uid = -#mail_gid = - -# Group to enable temporarily for privileged operations. Currently this is -# used only with INBOX when either its initial creation or dotlocking fails. -# Typically this is set to "mail" to give access to /var/mail. -mail_privileged_group = docker - -# Grant access to these supplementary groups for mail processes. Typically -# these are used to set up access to shared mailboxes. Note that it may be -# dangerous to set these if users can create symlinks (e.g. if "mail" group is -# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' -# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). -#mail_access_groups = - -# Allow full filesystem access to clients. There's no access checks other than -# what the operating system does for the active UID/GID. It works with both -# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ -# 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. -#mail_attribute_dict = - -## -## Mail processes -## - -# Don't use mmap() at all. This is required if you store indexes to shared -# filesystems (NFS or clustered filesystem). -#mmap_disable = no - -# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL -# since version 3, so this should be safe to use nowadays by default. -#dotlock_use_excl = yes - -# When to use fsync() or fdatasync() calls: -# optimized (default): Whenever necessary to avoid losing important data -# always: Useful with e.g. NFS when write()s are delayed -# never: Never use it (best performance, but crashes can lose data) -#mail_fsync = optimized - -# Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches -# whenever needed. If you're using only a single mail server this isn't needed. -#mail_nfs_storage = no -# Mail index files also exist in NFS. Setting this to yes requires -# mmap_disable=yes and fsync_disable=no. -#mail_nfs_index = no - -# Locking method for index files. Alternatives are fcntl, flock and dotlock. -# Dotlocking uses some tricks which may create more disk I/O than other locking -# methods. NFS users: flock doesn't work, remember to change mmap_disable. -#lock_method = fcntl - -# Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. -#mail_temp_dir = /tmp - -# Valid UID range for users, defaults to 500 and above. This is mostly -# to make sure that users can't log in as daemons or other system users. -# Note that denying root logins is hardcoded to dovecot binary and can't -# be done even if first_valid_uid is set to 0. -#first_valid_uid = 500 -#last_valid_uid = 0 - -# Valid GID range for users, defaults to non-root/wheel. Users having -# non-valid GID as primary group ID aren't allowed to log in. If user -# belongs to supplementary groups with non-valid GIDs, those groups are -# not set. -#first_valid_gid = 1 -#last_valid_gid = 0 - -# Maximum allowed length for mail keyword name. It's only forced when trying -# to create new keywords. -#mail_max_keyword_length = 50 - -# ':' separated list of directories under which chrooting is allowed for mail -# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). -# This setting doesn't affect login_chroot, mail_chroot or auth chroot -# settings. If this setting is empty, "/./" in home dirs are ignored. -# WARNING: Never add directories here which local users can modify, that -# may lead to root exploit. Usually this should be done only if you don't -# allow shell access for users. -#valid_chroot_dirs = - -# Default chroot directory for mail processes. This can be overridden for -# specific users in user database by giving /./ in user's home directory -# (eg. /home/./user chroots into /home). Note that usually there is no real -# need to do chrooting, Dovecot doesn't allow users to access files outside -# their mail directory anyway. If your home directories are prefixed with -# the chroot directory, append "/." to mail_chroot. -#mail_chroot = - -# UNIX socket path to master authentication server to find users. -# This is used by imap (for shared users) and lda. -#auth_socket_path = /var/run/dovecot/auth-userdb - -# Directory where to look up mail plugins. -#mail_plugin_dir = /usr/lib/dovecot/modules - -# Space separated list of plugins to load for all services. Plugins specific to -# IMAP, LDA, etc. are added to this list in their own .conf files. -#mail_plugins = - -## -## Mailbox handling optimizations -## - -# Mailbox list indexes can be used to optimize IMAP STATUS commands. They are -# also required for IMAP NOTIFY extension to be enabled. -#mailbox_list_index = 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. -#mail_cache_min_mail_count = 0 - -# 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 -# kqueue to find out immediately when changes occur. -#mailbox_idle_check_interval = 30 secs - -# Save mails with CR+LF instead of plain LF. This makes sending those mails -# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. -# But it also creates a bit more disk I/O which may just make it slower. -# Also note that if other software reads the mboxes/maildirs, they may handle -# the extra CRs wrong and cause problems. -#mail_save_crlf = no - -# Max number of mails to keep open and prefetch to memory. This only works with -# some mailbox formats and/or operating systems. -#mail_prefetch_count = 0 - -# How often to scan for stale temporary files and delete them (0 = never). -# These should exist only after Dovecot dies in the middle of saving mails. -#mail_temp_scan_interval = 1w - -## -## Maildir-specific settings -## - -# By default LIST command returns all entries in maildir beginning with a dot. -# Enabling this option makes Dovecot return only entries which are directories. -# This is done by stat()ing each entry, so it causes more disk I/O. -# (For systems setting struct dirent->d_type, this check is free and it's -# done always regardless of this setting) -#maildir_stat_dirs = no - -# When copying a message, do it with hard links whenever possible. This makes -# the performance much better, and it's unlikely to have any side effects. -#maildir_copy_with_hardlinks = yes - -# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only -# when its mtime changes unexpectedly or when we can't find the mail otherwise. -#maildir_very_dirty_syncs = no - -# If enabled, Dovecot doesn't use the S= in the Maildir filenames for -# getting the mail's physical size, except when recalculating Maildir++ quota. -# This can be useful in systems where a lot of the Maildir filenames have a -# broken size. The performance hit for enabling this is very small. -#maildir_broken_filename_sizes = no - -## -## mbox-specific settings -## - -# Which locking methods to use for locking mbox. There are four available: -# dotlock: Create .lock file. This is the oldest and most NFS-safe -# solution. If you want to use /var/mail/ like directory, the users -# will need write access to that directory. -# dotlock_try: Same as dotlock, but if it fails because of permissions or -# because there isn't enough disk space, just skip it. -# fcntl : Use this if possible. Works with NFS too if lockd is used. -# flock : May not exist in all systems. Doesn't work with NFS. -# lockf : May not exist in all systems. Doesn't work with NFS. -# -# You can use multiple locking methods; if you do the order they're declared -# in is important to avoid deadlocks if other MTAs/MUAs are using multiple -# locking methods as well. Some operating systems don't allow using some of -# them simultaneously. -# -# The Debian value for mbox_write_locks differs from upstream Dovecot. It is -# changed to be compliant with Debian Policy (section 11.6) for NFS safety. -# Dovecot: mbox_write_locks = dotlock fcntl -# Debian: mbox_write_locks = fcntl dotlock -# -#mbox_read_locks = fcntl -#mbox_write_locks = fcntl dotlock - -# Maximum time to wait for lock (all of them) before aborting. -#mbox_lock_timeout = 5 mins - -# If dotlock exists but the mailbox isn't modified in any way, override the -# lock file after this much time. -#mbox_dotlock_change_timeout = 2 mins - -# When mbox changes unexpectedly we have to fully read it to find out what -# changed. If the mbox is large this can take a long time. Since the change -# is usually just a newly appended mail, it'd be faster to simply read the -# new mails. If this setting is enabled, Dovecot does this but still safely -# fallbacks to re-reading the whole mbox file whenever something in mbox isn't -# how it's expected to be. The only real downside to this setting is that if -# some other MUA changes message flags, Dovecot doesn't notice it immediately. -# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK -# commands. -#mbox_dirty_syncs = yes - -# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, -# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. -#mbox_very_dirty_syncs = no - -# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK -# commands and when closing the mailbox). This is especially useful for POP3 -# where clients often delete all mails. The downside is that our changes -# aren't immediately visible to other MUAs. -#mbox_lazy_writes = yes - -# If mbox size is smaller than this (e.g. 100k), don't write index files. -# If an index file already exists it's still read, just not updated. -#mbox_min_index_size = 0 - -# Mail header selection algorithm to use for MD5 POP3 UIDLs when -# pop3_uidl_format=%m. For backwards compatibility we use apop3d inspired -# algorithm, but it fails if the first Received: header isn't unique in all -# mails. An alternative algorithm is "all" that selects all headers. -#mbox_md5 = apop3d - -## -## mdbox-specific settings -## - -# Maximum dbox file size until it's rotated. -#mdbox_rotate_size = 2M - -# Maximum dbox file age until it's rotated. Typically in days. Day begins -# from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. -#mdbox_rotate_interval = 0 - -# When creating new mdbox files, immediately preallocate their size to -# mdbox_rotate_size. This setting currently works only in Linux with some -# filesystems (ext4, xfs). -#mdbox_preallocate_space = no - -## -## Mail attachments -## - -# sdbox and mdbox support saving mail attachments to external files, which -# also allows single instance storage for them. Other backends don't support -# this for now. - -# Directory root where to store mail attachments. Disabled, if empty. -#mail_attachment_dir = - -# Attachments smaller than this aren't saved externally. It's also possible to -# write a plugin to disable saving specific attachments externally. -#mail_attachment_min_size = 128k - -# Filesystem backend to use for saving attachments: -# posix : No SiS done by Dovecot (but this might help FS's own deduplication) -# sis posix : SiS with immediate byte-by-byte comparison during saving -# sis-queue posix : SiS with delayed comparison and deduplication -#mail_attachment_fs = sis posix - -# Hash format to use in attachment filenames. You can add any text and -# variables: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}. -# Variables can be truncated, e.g. %{sha256:80} returns only first 80 bits -#mail_attachment_hash = %{sha1} diff --git a/test/config/dovecot-lmtp/conf.d/10-master.conf b/test/config/dovecot-lmtp/conf.d/10-master.conf deleted file mode 100644 index 7d0c7f2c..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-master.conf +++ /dev/null @@ -1,128 +0,0 @@ -#default_process_limit = 100 -#default_client_limit = 1000 - -# Default VSZ (virtual memory size) limit for service processes. This is mainly -# intended to catch and kill processes that leak memory before they eat up -# everything. -#default_vsz_limit = 256M - -# Login user is internally used by login processes. This is the most untrusted -# user in Dovecot system. It shouldn't have access to anything at all. -#default_login_user = dovenull - -# Internal user is used by unprivileged processes. It should be separate from -# login user, so that login processes can't disturb other processes. -#default_internal_user = dovecot - -service imap-login { - inet_listener imap { - #port = 143 - } - inet_listener imaps { - port = 993 - ssl = yes - } - - # Number of connections to handle before starting a new process. Typically - # the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 - # is faster. - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = $default_vsz_limit -} - -service pop3-login { - inet_listener pop3 { - #port = 110 - } - inet_listener pop3s { - port = 995 - ssl = yes - } -} - -service lmtp { - unix_listener lmtp { - mode = 0660 - group = postfix - } - - # Create inet listener only if you can't use the above UNIX socket - inet_listener lmtp { - # Avoid making LMTP visible for the entire internet - address = 0.0.0.0 - port = 24 - } -} - -service imap { - # Most of the memory goes to mmap()ing files. You may need to increase this - # limit if you have huge mailboxes. - #vsz_limit = $default_vsz_limit - - # Max. number of IMAP processes (connections) - #process_limit = 1024 -} - -service pop3 { - # Max. number of POP3 processes (connections) - #process_limit = 1024 -} - -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 - # full permissions to this socket are able to get a list of all usernames and - # get the results of everyone's userdb lookups. - # - # The default 0666 mode allows anyone to connect to the socket, but the - # userdb lookups will succeed only if the userdb returns an "uid" field that - # matches the caller process's UID. Also if caller's uid or gid matches the - # socket's uid or gid the lookup succeeds. Anything else causes a failure. - # - # To give the caller full permissions to lookup all users, set the mode to - # something else than 0666 and Dovecot lets the kernel enforce the - # permissions (e.g. 0777 allows everyone full permissions). - unix_listener auth-userdb { - mode = 0666 - user = docker - group = docker - } - - unix_listener auth-master { - mode = 0600 - user = docker - group = docker - } - - # Postfix smtp-auth - unix_listener /var/spool/postfix/private/auth { - mode = 0666 - user = docker - group = docker - } - - # Auth process is run as this user. - #user = $default_internal_user -} - -service auth-worker { - # Auth worker process is run as root by default, so that it can access - # /etc/shadow. If this isn't necessary, the user should be changed to - # $default_internal_user. - #user = root -} - -service dict { - # If dict proxy is used, mail processes should have access to its socket. - # For example: mode=0660, group=vmail and global mail_access_groups=vmail - unix_listener dict { - #mode = 0600 - #user = - #group = - } -} diff --git a/test/config/dovecot-lmtp/conf.d/10-ssl.conf b/test/config/dovecot-lmtp/conf.d/10-ssl.conf deleted file mode 100644 index 9cf53830..00000000 --- a/test/config/dovecot-lmtp/conf.d/10-ssl.conf +++ /dev/null @@ -1,61 +0,0 @@ -## -## SSL settings -## - -# SSL/TLS support: yes, no, required. -ssl = required - -# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before -# dropping root privileges, so keep the key file unreadable by anyone but root. -# These [snakeoil files actually exist](https://askubuntu.com/questions/396120/what-is-the-purpose-of-the-ssl-cert-snakeoil-key), but shouldn't ever be used in production! -# As `SSL_TYPE` env is required by docker-mailserver, these "snakeoil" files will be replaced on container startup. -ssl_cert = . %d expands to recipient domain. -postmaster_address = postmaster@domain.com - -# Hostname to use in various parts of sent mails (e.g. in Message-Id) and -# in LMTP replies. Default is the system's real hostname@domain. -#hostname = - -# If user is over quota, return with temporary failure instead of -# bouncing the mail. -#quota_full_tempfail = no - -# Binary to use for sending mails. -#sendmail_path = /usr/sbin/sendmail - -# If non-empty, send mails via this SMTP host[:port] instead of sendmail. -#submission_host = - -# Subject: header to use for rejection mails. You can use the same variables -# as for rejection_reason below. -#rejection_subject = Rejected: %s - -# Human readable error message for rejection mails. You can use variables: -# %n = CRLF, %r = reason, %s = original subject, %t = recipient -#rejection_reason = Your message to <%t> was automatically rejected:%n%r - -# Delimiter character between local-part and detail in email address. -#recipient_delimiter = + - -# Header where the original recipient address (SMTP's RCPT TO: address) is taken -# from if not available elsewhere. With dovecot-lda -a parameter overrides this. -# A commonly used header for this is X-Original-To. -#lda_original_recipient_header = - -# Should saving a mail to a nonexistent mailbox automatically create it? -lda_mailbox_autocreate = yes - -# Should automatically created mailboxes be also automatically subscribed? -lda_mailbox_autosubscribe = yes - -protocol lda { - # Space separated list of plugins to load (default is global mail_plugins). - mail_plugins = $mail_plugins sieve -} diff --git a/test/config/dovecot-lmtp/conf.d/15-mailboxes.conf b/test/config/dovecot-lmtp/conf.d/15-mailboxes.conf deleted file mode 100644 index 73ed268c..00000000 --- a/test/config/dovecot-lmtp/conf.d/15-mailboxes.conf +++ /dev/null @@ -1,50 +0,0 @@ -## -## Mailbox definitions -## - -# NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf. -namespace inbox { - - #mailbox name { - # auto=create will automatically create this mailbox. - # auto=subscribe will both create and subscribe to the mailbox. - #auto = no - - # Space separated list of IMAP SPECIAL-USE attributes as specified by - # RFC 6154: \All \Archive \Drafts \Flagged \Junk \Sent \Trash - #special_use = - #} - - # These mailboxes are widely used and could perhaps be created automatically: - mailbox Drafts { - auto = subscribe - special_use = \Drafts - } - mailbox Junk { - special_use = \Junk - } - mailbox Trash { - auto = subscribe - special_use = \Trash - } - - # For \Sent mailboxes there are two widely used names. We'll mark both of - # them as \Sent. User typically deletes one of them if duplicates are created. - mailbox Sent { - auto = subscribe - special_use = \Sent - } -# mailbox "Sent Messages" { -# special_use = \Sent -# } - - # If you have a virtual "All messages" mailbox: - #mailbox virtual/All { - # special_use = \All - #} - - # If you have a virtual "Flagged" mailbox: - #mailbox virtual/Flagged { - # special_use = \Flagged - #} -} diff --git a/test/config/dovecot-lmtp/conf.d/20-imap.conf b/test/config/dovecot-lmtp/conf.d/20-imap.conf deleted file mode 100644 index 685917b6..00000000 --- a/test/config/dovecot-lmtp/conf.d/20-imap.conf +++ /dev/null @@ -1,61 +0,0 @@ -## -## IMAP specific settings -## - -# Maximum IMAP command line length. Some clients generate very long command -# lines with huge mailboxes, so you may need to raise this if you get -# "Too long argument" or "IMAP command line too large" errors often. -#imap_max_line_length = 64k - -# IMAP logout format string: -# %i - total number of bytes read from client -# %o - total number of bytes sent to client -#imap_logout_format = in=%i out=%o - -# Override the IMAP CAPABILITY response. If the value begins with '+', -# add the given capabilities on top of the defaults (e.g. +XFOO XBAR). -#imap_capability = - -# How long to wait between "OK Still here" notifications when client is -# IDLEing. -#imap_idle_notify_interval = 2 mins - -# ID field names and values to send to clients. Using * as the value makes -# Dovecot use the default value. The following fields have default values -# currently: name, version, os, os-version, support-url, support-email. -#imap_id_send = - -# ID fields sent by client to log. * means everything. -#imap_id_log = - -# Workarounds for various client bugs: -# delay-newmail: -# Send EXISTS/RECENT new mail notifications only when replying to NOOP -# and CHECK commands. Some clients ignore them otherwise, for example OSX -# Mail ( - #service_count = 1 - - # Number of processes to always keep waiting for more connections. - #process_min_avail = 0 - - # If you set service_count=0, you probably need to grow this. - #vsz_limit = 64M -#} - -#service managesieve { - # Max. number of ManageSieve processes (connections) - #process_limit = 1024 -#} - -# Service configuration - -protocol sieve { - # Maximum ManageSieve command line length in bytes. ManageSieve usually does - # not involve overly long command lines, so this setting will not normally - # need adjustment - #managesieve_max_line_length = 65536 - - # Maximum number of ManageSieve connections allowed for a user from each IP - # address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (none known to be useful so far). - # Do NOT try to load IMAP plugins here. - #mail_plugins = - - # MANAGESIEVE logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - #managesieve_logout_format = bytes=%i/%o - - # To fool ManageSieve clients that are focused on CMU's timesieved you can - # specify the IMPLEMENTATION capability that Dovecot reports to clients. - # For example: 'Cyrus timsieved v2.2.13' - #managesieve_implementation_string = Dovecot Pigeonhole - - # Explicitly specify the SIEVE and NOTIFY capability reported by the server - # before login. If left unassigned these will be reported dynamically - # according to what the Sieve interpreter supports by default (after login - # this may differ depending on the user). - #managesieve_sieve_capability = - #managesieve_notify_capability = - - # The maximum number of compile errors that are returned to the client upon - # script upload or script verification. - #managesieve_max_compile_errors = 5 - - # Refer to 90-sieve.conf for script quota configuration and configuration of - # Sieve execution limits. -} diff --git a/test/config/dovecot-lmtp/conf.d/20-pop3.conf b/test/config/dovecot-lmtp/conf.d/20-pop3.conf deleted file mode 100644 index d8fbb278..00000000 --- a/test/config/dovecot-lmtp/conf.d/20-pop3.conf +++ /dev/null @@ -1,98 +0,0 @@ -## -## POP3 specific settings -## - -# Don't try to set mails non-recent or seen with POP3 sessions. This is -# mostly intended to reduce disk I/O. With maildir it doesn't move files -# from new/ to cur/, with mbox it doesn't write Status-header. -#pop3_no_flag_updates = no - -# Support LAST command which exists in old POP3 specs, but has been removed -# from new ones. Some clients still wish to use this though. Enabling this -# makes RSET command clear all \Seen flags from messages. -#pop3_enable_last = no - -# If mail has X-UIDL header, use it as the mail's UIDL. -#pop3_reuse_xuidl = no - -# Allow only one POP3 session to run simultaneously for the same user. -#pop3_lock_session = no - -# POP3 requires message sizes to be listed as if they had CR+LF linefeeds. -# Many POP3 servers violate this by returning the sizes with LF linefeeds, -# because it's faster to get. When this setting is enabled, Dovecot still -# tries to do the right thing first, but if that requires opening the -# message, it fallbacks to the easier (but incorrect) size. -#pop3_fast_size_lookups = no - -# POP3 UIDL (unique mail identifier) format to use. You can use following -# variables, along with the variable modifiers described in -# doc/wiki/Variables.txt (e.g. %Uf for the filename in uppercase) -# -# %v - Mailbox's IMAP UIDVALIDITY -# %u - Mail's IMAP UID -# %m - MD5 sum of the mailbox headers in hex (mbox only) -# %f - filename (maildir only) -# %g - Mail's GUID -# -# If you want UIDL compatibility with other POP3 servers, use: -# UW's ipop3d : %08Xv%08Xu -# Courier : %f or %v-%u (both might be used simultaneosly) -# Cyrus (<= 2.1.3) : %u -# Cyrus (>= 2.1.4) : %v.%u -# Dovecot v0.99.x : %v.%u -# tpop3d : %Mf -# -# Note that Outlook 2003 seems to have problems with %v.%u format which was -# Dovecot's default, so if you're building a new server it would be a good -# idea to change this. %08Xu%08Xv should be pretty fail-safe. -# -#pop3_uidl_format = %08Xu%08Xv - -# Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes -# won't change those UIDLs. Currently this works only with Maildir. -#pop3_save_uidl = no - -# What to do about duplicate UIDLs if they exist? -# allow: Show duplicates to clients. -# rename: Append a temporary -2, -3, etc. counter after the UIDL. -#pop3_uidl_duplicates = allow - -# This option changes POP3 behavior so that it's not possible to actually -# delete mails via POP3, only hide them from future POP3 sessions. The mails -# will still be counted towards user's quota until actually deleted via IMAP. -# Use e.g. "$POP3Deleted" as the value (it will be visible as IMAP keyword). -# Make sure you can legally archive mails before enabling this setting. -#pop3_deleted_flag = - -# POP3 logout format string: -# %i - total number of bytes read from client -# %o - total number of bytes sent to client -# %t - number of TOP commands -# %p - number of bytes sent to client as a result of TOP command -# %r - number of RETR commands -# %b - number of bytes sent to client as a result of RETR command -# %d - number of deleted messages -# %m - number of messages (before deletion) -# %s - mailbox size in bytes (before deletion) -# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly -#pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - -# Workarounds for various client bugs: -# outlook-no-nuls: -# Outlook and Outlook Express hang if mails contain NUL characters. -# This setting replaces them with 0x80 character. -# oe-ns-eoh: -# Outlook Express and Netscape Mail breaks if end of headers-line is -# missing. This option simply sends it if it's missing. -# The list is space-separated. -#pop3_client_workarounds = - -protocol pop3 { - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 -} diff --git a/test/config/dovecot-lmtp/conf.d/90-acl.conf b/test/config/dovecot-lmtp/conf.d/90-acl.conf deleted file mode 100644 index f0c0e7a5..00000000 --- a/test/config/dovecot-lmtp/conf.d/90-acl.conf +++ /dev/null @@ -1,19 +0,0 @@ -## -## Mailbox access control lists. -## - -# vfile backend reads ACLs from "dovecot-acl" file from mail directory. -# You can also optionally give a global ACL directory path where ACLs are -# applied to all users' mailboxes. The global ACL directory contains -# one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter -# specifies how many seconds to wait between stat()ing dovecot-acl file -# to see if it changed. -plugin { - #acl = vfile:/etc/dovecot/global-acls:cache_secs=300 -} - -# To let users LIST mailboxes shared by other users, Dovecot needs a -# shared mailbox dictionary. For example: -plugin { - #acl_shared_dict = file:/var/lib/dovecot/shared-mailboxes -} diff --git a/test/config/dovecot-lmtp/conf.d/90-plugin.conf b/test/config/dovecot-lmtp/conf.d/90-plugin.conf deleted file mode 100644 index 8c8fccf4..00000000 --- a/test/config/dovecot-lmtp/conf.d/90-plugin.conf +++ /dev/null @@ -1,11 +0,0 @@ -## -## Plugin settings -## - -# All wanted plugins must be listed in mail_plugins setting before any of the -# settings take effect. See for list of plugins and -# their configuration. Note that %variable expansion is done for all values. - -plugin { - #setting_name = value -} diff --git a/test/config/dovecot-lmtp/conf.d/90-quota.conf b/test/config/dovecot-lmtp/conf.d/90-quota.conf deleted file mode 100644 index 13a3f95e..00000000 --- a/test/config/dovecot-lmtp/conf.d/90-quota.conf +++ /dev/null @@ -1,80 +0,0 @@ -## -## Quota configuration. -## - -# Note that you also have to enable quota plugin in mail_plugins setting. -# - -## -## Quota limits -## - -# Quota limits are set using "quota_rule" parameters. To get per-user quota -# limits, you can set/override them by returning "quota_rule" extra field -# from userdb. It's also possible to give mailbox-specific limits, for example -# to give additional 100 MB when saving to Trash: - -plugin { - #quota_rule = *:storage=1G - #quota_rule2 = Trash:storage=+100M - - # LDA/LMTP allows saving the last mail to bring user from under quota to - # over quota, if the quota doesn't grow too high. Default is to allow as - # long as quota will stay under 10% above the limit. Also allowed e.g. 10M. - #quota_grace = 10%% -} - -## -## Quota warnings -## - -# You can execute a given command when user exceeds a specified quota limit. -# Each quota root has separate limits. Only the command for the first -# exceeded limit is executed, so put the highest limit first. -# The commands are executed via script service by connecting to the named -# UNIX socket (quota-warning below). -# Note that % needs to be escaped as %%, otherwise "% " expands to empty. - -plugin { - #quota_warning = storage=95%% quota-warning 95 %u - #quota_warning2 = storage=80%% quota-warning 80 %u -} - -# Example quota-warning service. The unix listener's permissions should be -# set in a way that mail processes can connect to it. Below example assumes -# that mail processes run as vmail user. If you use mode=0666, all system users -# can generate quota warnings to anyone. -#service quota-warning { -# executable = script /usr/local/bin/quota-warning.sh -# user = dovecot -# unix_listener quota-warning { -# user = vmail -# } -#} - -## -## Quota backends -## - -# Multiple backends are supported: -# dirsize: Find and sum all the files found from mail directory. -# Extremely SLOW with Maildir. It'll eat your CPU and disk I/O. -# dict: Keep quota stored in dictionary (eg. SQL) -# maildir: Maildir++ quota -# fs: Read-only support for filesystem quota - -plugin { - #quota = dirsize:User quota - #quota = maildir:User quota - #quota = dict:User quota::proxy::quota - #quota = fs:User quota -} - -# Multiple quota roots are also possible, for example this gives each user -# their own 100MB quota and one shared 1GB quota within the domain: -plugin { - #quota = dict:user::proxy::quota - #quota2 = dict:domain:%d:proxy::quota_domain - #quota_rule = *:storage=102400 - #quota2_rule = *:storage=1048576 -} diff --git a/test/config/dovecot-lmtp/conf.d/90-sieve.conf b/test/config/dovecot-lmtp/conf.d/90-sieve.conf deleted file mode 100644 index 1ebf9f33..00000000 --- a/test/config/dovecot-lmtp/conf.d/90-sieve.conf +++ /dev/null @@ -1,105 +0,0 @@ -## -## Settings for the Sieve interpreter -## - -# Do not forget to enable the Sieve plugin in 15-lda.conf and 20-lmtp.conf -# by adding it to the respective mail_plugins= settings. - -plugin { - # The path to the user's main active script. If ManageSieve is used, this the - # location of the symbolic link controlled by ManageSieve. - sieve = ~/.dovecot.sieve - - # The default Sieve script when the user has none. This is a path to a global - # sieve script file, which gets executed ONLY if user's private Sieve script - # doesn't exist. Be sure to pre-compile this script manually using the sievec - # command line tool. - # --> See sieve_before fore executing scripts before the user's personal - # script. - #sieve_default = /var/lib/dovecot/sieve/default.sieve - - # Directory for :personal include scripts for the include extension. This - # is also where the ManageSieve service stores the user's scripts. - sieve_dir = ~/sieve - - # Directory for :global include scripts for the include extension. - #sieve_global_dir = - - # Path to a script file or a directory containing script files that need to be - # executed before the user's script. If the path points to a directory, all - # the Sieve scripts contained therein (with the proper .sieve extension) are - # executed. The order of execution within a directory is determined by the - # file names, using a normal 8bit per-character comparison. Multiple script - # file or directory paths can be specified by appending an increasing number. - #sieve_before = - #sieve_before2 = - #sieve_before3 = (etc...) - - # Identical to sieve_before, only the specified scripts are executed after the - # user's script (only when keep is still in effect!). Multiple script file or - # directory paths can be specified by appending an increasing number. - #sieve_after = - #sieve_after2 = - #sieve_after2 = (etc...) - - # Which Sieve language extensions are available to users. By default, all - # supported extensions are available, except for deprecated extensions or - # those that are still under development. Some system administrators may want - # to disable certain Sieve extensions or enable those that are not available - # by default. This setting can use '+' and '-' to specify differences relative - # to the default. For example `sieve_extensions = +imapflags' will enable the - # deprecated imapflags extension in addition to all extensions were already - # enabled by default. - #sieve_extensions = +notify +imapflags - - # Which Sieve language extensions are ONLY available in global scripts. This - # can be used to restrict the use of certain Sieve extensions to administrator - # control, for instance when these extensions can cause security concerns. - # This setting has higher precedence than the `sieve_extensions' setting - # (above), meaning that the extensions enabled with this setting are never - # available to the user's personal script no matter what is specified for the - # `sieve_extensions' setting. The syntax of this setting is similar to the - # `sieve_extensions' setting, with the difference that extensions are - # enabled or disabled for exclusive use in global scripts. Currently, no - # extensions are marked as such by default. - #sieve_global_extensions = - - # The Pigeonhole Sieve interpreter can have plugins of its own. Using this - # setting, the used plugins can be specified. Check the Dovecot wiki - # (wiki2.dovecot.org) or the pigeonhole website - # (http://pigeonhole.dovecot.org) for available plugins. - # The sieve_extprograms plugin is included in this release. - #sieve_plugins = - - # The separator that is expected between the :user and :detail - # address parts introduced by the subaddress extension. This may - # also be a sequence of characters (e.g. '--'). The current - # implementation looks for the separator from the left of the - # localpart and uses the first one encountered. The :user part is - # left of the separator and the :detail part is right. This setting - # is also used by Dovecot's LMTP service. - #recipient_delimiter = + - - # The maximum size of a Sieve script. The compiler will refuse to compile any - # script larger than this limit. If set to 0, no limit on the script size is - # enforced. - #sieve_max_script_size = 1M - - # The maximum number of actions that can be performed during a single script - # execution. If set to 0, no limit on the total number of actions is enforced. - #sieve_max_actions = 32 - - # The maximum number of redirect actions that can be performed during a single - # script execution. If set to 0, no redirect actions are allowed. - #sieve_max_redirects = 4 - - # The maximum number of personal Sieve scripts a single user can have. If set - # to 0, no limit on the number of scripts is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_scripts = 0 - - # The maximum amount of disk storage a single user's scripts may occupy. If - # set to 0, no limit on the used amount of disk storage is enforced. - # (Currently only relevant for ManageSieve) - #sieve_quota_max_storage = 0 -} diff --git a/test/config/dovecot-lmtp/conf.d/auth-checkpassword.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-checkpassword.conf.ext deleted file mode 100644 index b2fb13a2..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-checkpassword.conf.ext +++ /dev/null @@ -1,21 +0,0 @@ -# Authentication for checkpassword users. Included from 10-auth.conf. -# -# - -passdb { - driver = checkpassword - args = /usr/bin/checkpassword -} - -# passdb lookup should return also userdb info -userdb { - driver = prefetch -} - -# Standard checkpassword doesn't support direct userdb lookups. -# If you need checkpassword userdb, the checkpassword must support -# Dovecot-specific extensions. -#userdb { -# driver = checkpassword -# args = /usr/bin/checkpassword -#} diff --git a/test/config/dovecot-lmtp/conf.d/auth-deny.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-deny.conf.ext deleted file mode 100644 index ce3f1cf1..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-deny.conf.ext +++ /dev/null @@ -1,15 +0,0 @@ -# Deny access for users. Included from 10-auth.conf. - -# Users can be (temporarily) disabled by adding a passdb with deny=yes. -# If the user is found from that database, authentication will fail. -# The deny passdb should always be specified before others, so it gets -# checked first. - -# Example deny passdb using passwd-file. You can use any passdb though. -passdb { - driver = passwd-file - deny = yes - - # File contains a list of usernames, one per line - args = /etc/dovecot/deny-users -} diff --git a/test/config/dovecot-lmtp/conf.d/auth-ldap.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-ldap.conf.ext deleted file mode 100644 index b54d709e..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-ldap.conf.ext +++ /dev/null @@ -1,33 +0,0 @@ -# Authentication for LDAP users. Included from 10-auth.conf. -# -# - -passdb { - driver = ldap - - # Path for LDAP configuration file, see example-config/dovecot-ldap.conf.ext - args = /etc/dovecot/dovecot-ldap.conf.ext -} - -# "prefetch" user database means that the passdb already provided the -# needed information and there's no need to do a separate userdb lookup. -# -#userdb { -# driver = prefetch -#} - -userdb { - driver = ldap - args = /etc/dovecot/dovecot-ldap.conf.ext - - # Default fields can be used to specify defaults that LDAP may override - #default_fields = home=/home/virtual/%u -} - -# If you don't have any user-specific settings, you can avoid the userdb LDAP -# lookup by using userdb static instead of userdb ldap, for example: -# -#userdb { - #driver = static - #args = uid=vmail gid=vmail home=/var/vmail/%u -#} diff --git a/test/config/dovecot-lmtp/conf.d/auth-master.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-master.conf.ext deleted file mode 100644 index 2cf128f1..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-master.conf.ext +++ /dev/null @@ -1,16 +0,0 @@ -# Authentication for master users. Included from 10-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. -# - -# Example master user passdb using passwd-file. You can use any passdb though. -passdb { - driver = passwd-file - master = yes - args = /etc/dovecot/master-users - - # Unless you're using PAM, you probably still want the destination user to - # be looked up from passdb that it really exists. pass=yes does that. - pass = yes -} diff --git a/test/config/dovecot-lmtp/conf.d/auth-passwdfile.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index d05c9abb..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,19 +0,0 @@ -# Authentication for passwd-file users. Included from 10-auth.conf. -# -# Documentation -# PassDB: https://doc.dovecot.org/configuration_manual/authentication/password_databases_passdb/ -# UserDB: https://doc.dovecot.org/configuration_manual/authentication/user_databases_userdb/ -# -# !!! Attention !!! -# Do not add `scheme=SHA512-CRYPT` to the userdb args. This is not supported. - -passdb { - driver = passwd-file - args = scheme=SHA512-CRYPT username_format=%u /etc/dovecot/userdb -} - -userdb { - driver = passwd-file - args = username_format=%u /etc/dovecot/userdb - default_fields = uid=docker gid=docker home=/var/mail/%d/%u -} diff --git a/test/config/dovecot-lmtp/conf.d/auth-passwdfile.inc b/test/config/dovecot-lmtp/conf.d/auth-passwdfile.inc deleted file mode 100644 index d05c9abb..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-passwdfile.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Authentication for passwd-file users. Included from 10-auth.conf. -# -# Documentation -# PassDB: https://doc.dovecot.org/configuration_manual/authentication/password_databases_passdb/ -# UserDB: https://doc.dovecot.org/configuration_manual/authentication/user_databases_userdb/ -# -# !!! Attention !!! -# Do not add `scheme=SHA512-CRYPT` to the userdb args. This is not supported. - -passdb { - driver = passwd-file - args = scheme=SHA512-CRYPT username_format=%u /etc/dovecot/userdb -} - -userdb { - driver = passwd-file - args = username_format=%u /etc/dovecot/userdb - default_fields = uid=docker gid=docker home=/var/mail/%d/%u -} diff --git a/test/config/dovecot-lmtp/conf.d/auth-sql.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-sql.conf.ext deleted file mode 100644 index ccbea864..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-sql.conf.ext +++ /dev/null @@ -1,30 +0,0 @@ -# Authentication for SQL users. Included from 10-auth.conf. -# -# - -passdb { - driver = sql - - # Path for SQL configuration file, see example-config/dovecot-sql.conf.ext - args = /etc/dovecot/dovecot-sql.conf.ext -} - -# "prefetch" user database means that the passdb already provided the -# needed information and there's no need to do a separate userdb lookup. -# -#userdb { -# driver = prefetch -#} - -userdb { - driver = sql - args = /etc/dovecot/dovecot-sql.conf.ext -} - -# If you don't have any user-specific settings, you can avoid the user_query -# by using userdb static instead of userdb sql, for example: -# -#userdb { - #driver = static - #args = uid=vmail gid=vmail home=/var/vmail/%u -#} diff --git a/test/config/dovecot-lmtp/conf.d/auth-static.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-static.conf.ext deleted file mode 100644 index 90890c59..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-static.conf.ext +++ /dev/null @@ -1,24 +0,0 @@ -# Static passdb. Included from 10-auth.conf. - -# This can be used for situations where Dovecot doesn't need to verify the -# username or the password, or if there is a single password for all users: -# -# - proxy frontend, where the backend verifies the password -# - proxy backend, where the frontend already verified the password -# - authentication with SSL certificates -# - simple testing - -#passdb { -# driver = static -# args = proxy=y host=%1Mu.example.com nopassword=y -#} - -#passdb { -# driver = static -# args = password=test -#} - -#userdb { -# driver = static -# args = uid=vmail gid=vmail home=/home/%u -#} diff --git a/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext deleted file mode 100644 index f9b28138..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext +++ /dev/null @@ -1,74 +0,0 @@ -# Authentication for system users. Included from 10-auth.conf. -# -# -# - -# PAM authentication. Preferred nowadays by most systems. -# PAM is typically used with either userdb passwd or userdb static. -# REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM -# authentication to actually work. -passdb { - driver = pam - # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=] - # [cache_key=] [] - #args = dovecot -} - -# System users (NSS, /etc/passwd, or similar). -# In many systems nowadays this uses Name Service Switch, which is -# configured in /etc/nsswitch.conf. -#passdb { - #driver = passwd - # [blocking=no] - #args = -#} - -# Shadow passwords for system users (NSS, /etc/shadow or similar). -# Deprecated by PAM nowadays. -# -#passdb { - #driver = shadow - # [blocking=no] - #args = -#} - -# PAM-like authentication for OpenBSD. -# -#passdb { - #driver = bsdauth - # [blocking=no] [cache_key=] - #args = -#} - -## -## User databases -## - -# System users (NSS, /etc/passwd, or similar). In many systems nowadays this -# uses Name Service Switch, which is configured in /etc/nsswitch.conf. -userdb { - # - driver = passwd - # [blocking=no] - #args = - - # Override fields from passwd - #override_fields = home=/home/virtual/%u -} - -# Static settings generated from template -#userdb { - #driver = static - # Can return anything a userdb could normally return. For example: - # - # args = uid=500 gid=500 home=/var/mail/%u - # - # LDA and LMTP needs to look up users only from the userdb. This of course - # doesn't work with static userdb because there is no list of users. - # Normally static userdb handles this by doing a passdb lookup. This works - # with most passdbs, with PAM being the most notable exception. If you do - # the user verification another way, you can add allow_all_users=yes to - # the args in which case the passdb lookup is skipped. - # - #args = -#} diff --git a/test/config/dovecot-lmtp/conf.d/auth-vpopmail.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-vpopmail.conf.ext deleted file mode 100644 index f2da976b..00000000 --- a/test/config/dovecot-lmtp/conf.d/auth-vpopmail.conf.ext +++ /dev/null @@ -1,17 +0,0 @@ -# Authentication for vpopmail users. Included from 10-auth.conf. -# -# - -passdb { - driver = vpopmail - - # [cache_key=] [webmail=] - args = -} - -userdb { - driver = vpopmail - - # [quota_template=