From 46730acf42cbde7d087b887eb78c3f06dc27d9ca Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 20 May 2018 18:58:07 +0200 Subject: [PATCH] start dovecot config; generate postfix transport_map; support multiple sender IPs in postfix --- roles/email/handlers/main.yml | 2 + roles/email/tasks/dovecot.yml | 42 ++ roles/email/tasks/main.yml | 3 + roles/email/tasks/postfix.yml | 37 +- .../templates/dovecot/conf.d/10-auth.conf | 128 ++++++ .../templates/dovecot/conf.d/10-mail.conf | 385 ++++++++++++++++++ .../templates/dovecot/conf.d/10-master.conf | 124 ++++++ .../templates/dovecot/conf.d/10-ssl.conf | 62 +++ .../templates/dovecot/conf.d/15-lda.conf | 48 +++ .../templates/dovecot/conf.d/20-imap.conf | 75 ++++ .../templates/dovecot/conf.d/20-lmtp.conf | 26 ++ .../templates/dovecot/conf.d/90-quota.conf | 80 ++++ .../dovecot/conf.d/auth-sql.conf.ext | 30 ++ .../templates/dovecot/dovecot-sql.conf.ext | 144 +++++++ .../email/templates/dovecot/quota-warning.sh | 19 + roles/email/templates/main.cf | 20 +- roles/email/templates/master.cf | 13 + roles/email/templates/mysql_vmail_aliases.cf | 2 +- roles/email/templates/mysql_vmail_senders.cf | 2 +- roles/email/templates/mysql_vmail_users.cf | 3 +- roles/email/templates/transport_map | 3 + roles/etherpad/tasks/main.yml | 3 + 22 files changed, 1229 insertions(+), 22 deletions(-) create mode 100644 roles/email/tasks/dovecot.yml create mode 100644 roles/email/templates/dovecot/conf.d/10-auth.conf create mode 100644 roles/email/templates/dovecot/conf.d/10-mail.conf create mode 100644 roles/email/templates/dovecot/conf.d/10-master.conf create mode 100644 roles/email/templates/dovecot/conf.d/10-ssl.conf create mode 100644 roles/email/templates/dovecot/conf.d/15-lda.conf create mode 100644 roles/email/templates/dovecot/conf.d/20-imap.conf create mode 100644 roles/email/templates/dovecot/conf.d/20-lmtp.conf create mode 100644 roles/email/templates/dovecot/conf.d/90-quota.conf create mode 100644 roles/email/templates/dovecot/conf.d/auth-sql.conf.ext create mode 100644 roles/email/templates/dovecot/dovecot-sql.conf.ext create mode 100644 roles/email/templates/dovecot/quota-warning.sh create mode 100644 roles/email/templates/transport_map diff --git a/roles/email/handlers/main.yml b/roles/email/handlers/main.yml index 47e0daf..b953a16 100644 --- a/roles/email/handlers/main.yml +++ b/roles/email/handlers/main.yml @@ -4,3 +4,5 @@ service: name=postfix state=restarted enabled=yes - name: unbound service: name=unbound state=restarted enabled=yes +- name: dovecot + service: name=dovecot state=restarted enabled=yes diff --git a/roles/email/tasks/dovecot.yml b/roles/email/tasks/dovecot.yml new file mode 100644 index 0000000..f4929eb --- /dev/null +++ b/roles/email/tasks/dovecot.yml @@ -0,0 +1,42 @@ +- name: install dovecot + apt: name=dovecot-imapd,dovecot-lmtpd,dovecot-mysql,dovecot-pop3d,dovecot-sieve,dovecot-managesieved state=latest +- name: enable dovecot + service: name=dovecot enabled=yes +# configuration +- name: check mail group + shell: "test \"$(id -g mail)\" -eq '{{postfix.dovecot.mail_gid}}'" + changed_when: "False" +- name: create vmail user + user: + name: vmail + group: mail + uid: "{{postfix.dovecot.vmail_uid}}" + shell: /bin/false + home: /var/vmail + create_home: no + system: yes +- name: create vmail dir + file: name=/var/vmail state=directory owner=vmail group=mail +- name: configure dovecot + notify: dovecot + template: + dest: /etc/dovecot/{{ item }} + src: templates/dovecot/{{ item }} + mode: u=rw,g=r,o= + group: dovecot + loop: + - conf.d/10-auth.conf + - conf.d/10-mail.conf + - conf.d/10-master.conf + - conf.d/10-ssl.conf + - conf.d/15-lda.conf + - conf.d/20-imap.conf + - conf.d/20-lmtp.conf + - conf.d/90-quota.conf + - conf.d/auth-sql.conf.ext + - dovecot-sql.conf.ext +- name: install quota notification script + template: + dest: /etc/dovecot/quota-warning.sh + src: templates/dovecot/quota-warning.sh + mode: +x diff --git a/roles/email/tasks/main.yml b/roles/email/tasks/main.yml index 176ac20..dbe8bb6 100644 --- a/roles/email/tasks/main.yml +++ b/roles/email/tasks/main.yml @@ -4,6 +4,9 @@ - import_tasks: opendkim.yml tags: opendkim when: postfix.opendkim is defined +- import_tasks: dovecot.yml + when: postfix.dovecot is defined + tags: dovecot - import_tasks: postfix.yml tags: postfix # some basic security stuff that relies on working email diff --git a/roles/email/tasks/postfix.yml b/roles/email/tasks/postfix.yml index bda2256..6644321 100644 --- a/roles/email/tasks/postfix.yml +++ b/roles/email/tasks/postfix.yml @@ -1,7 +1,7 @@ - name: install postfix apt: name=postfix,bsd-mailx state=latest - name: install postfix-mysql - when: postfix.vmail_mysql_password is defined + when: postfix.dovecot is defined apt: name=postfix-mysql state=latest - name: enable postfix service: name=postfix enabled=yes @@ -15,7 +15,7 @@ - master.cf notify: postfix - name: install postfix mysql config - when: postfix.vmail_mysql_password is defined + when: postfix.dovecot is defined template: dest: /etc/postfix/{{ item }} src: templates/{{ item }} @@ -26,15 +26,6 @@ - mysql_vmail_senders.cf - mysql_vmail_users.cf notify: postfix -- name: create empty maps - when: postfix.virtual_mailbox_domains is defined - copy: - dest: /etc/postfix/{{ item }} - content: "" - force: no - loop: - - virtual_alias_map - - transport_map - name: give postfix user access to opendkim # we assume the user alredy exists (it is created above by installing postfix) when: postfix.opendkim is defined @@ -43,6 +34,28 @@ groups: opendkim append: yes notify: postfix +# maps +- name: create empty virtual_alias_map + when: postfix.virtual_mailbox_domains is defined + register: virtual_alias_map + copy: + dest: /etc/postfix/virtual_alias_map + content: "" + force: no +- name: postmap virtual_alias_map + when: virtual_alias_map.changed + command: postmap /etc/postfix/virtual_alias_map + notify: postfix +- name: create transport_map + when: postfix.virtual_mailbox_domains is defined + register: transport_map + template: + dest: /etc/postfix/transport_map + src: templates/transport_map +- name: postmap transport_map + when: transport_map.changed + command: postmap /etc/postfix/transport_map + notify: postfix # cronjobs - name: delete old local-mail cronjob file: path=/etc/cron.daily/local-mail state=absent @@ -75,4 +88,4 @@ copy: dest: /root/newmail/templates.py src: files/newmail/templates.py - when: postfix.vmail_mysql_password is defined + when: postfix.dovecot is defined diff --git a/roles/email/templates/dovecot/conf.d/10-auth.conf b/roles/email/templates/dovecot/conf.d/10-auth.conf new file mode 100644 index 0000000..7c814e0 --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/10-auth.conf @@ -0,0 +1,128 @@ +## +## 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.conf.ext +#!include auth-checkpassword.conf.ext +#!include auth-vpopmail.conf.ext +#!include auth-static.conf.ext diff --git a/roles/email/templates/dovecot/conf.d/10-mail.conf b/roles/email/templates/dovecot/conf.d/10-mail.conf new file mode 100644 index 0000000..d9f97af --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/10-mail.conf @@ -0,0 +1,385 @@ +## +## 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/vmail/%u + +# 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 + + # See 15-mailboxes.conf for definitions of special mailboxes. +} + +# 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 = vmail +mail_gid = mail + +# 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 = mail + +# 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. 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 +## + +# 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 + +# 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 = {{postfix.dovecot.vmail_uid}} +last_valid_uid = {{postfix.dovecot.vmail_uid}} + +# 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 = {{postfix.dovecot.mail_gid}} +last_valid_gid = {{postfix.dovecot.mail_gid}} + +# 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 = quota + +## +## 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 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 + +# Always move mails from new/ directory to cur/, even when the \Recent flags +# aren't being reset. +#maildir_empty_new = 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/roles/email/templates/dovecot/conf.d/10-master.conf b/roles/email/templates/dovecot/conf.d/10-master.conf new file mode 100644 index 0000000..217d413 --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/10-master.conf @@ -0,0 +1,124 @@ +#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 /var/spool/postfix/private/dovecot-lmtp { + # use "lmtp:unix:private/dovecot-lmtp" as postfix transport to connect here + group = postfix + mode = 0600 + user = 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 = + #port = + #} +} + +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 = + #group = + } + + # Postfix smtp-auth + unix_listener /var/spool/postfix/private/auth { + mode = 0660 + user = postfix + group = postfix + } + + # 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/roles/email/templates/dovecot/conf.d/10-ssl.conf b/roles/email/templates/dovecot/conf.d/10-ssl.conf new file mode 100644 index 0000000..066f372 --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/10-ssl.conf @@ -0,0 +1,62 @@ +## +## 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. Included doc/mkcert.sh can be used to easily generate self-signed +# certificate, just make sure to update the domains in dovecot-openssl.cnf +ssl_cert = . %d expands to recipient domain. +postmaster_address = {{postfix.dovecot.postmaster}} + +# 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 = no + +# Should automatically created mailboxes be also automatically subscribed? +#lda_mailbox_autosubscribe = no + +protocol lda { + # Space separated list of plugins to load (default is global mail_plugins). + mail_plugins = $mail_plugins sieve +} diff --git a/roles/email/templates/dovecot/conf.d/20-imap.conf b/roles/email/templates/dovecot/conf.d/20-imap.conf new file mode 100644 index 0000000..9565c41 --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/20-imap.conf @@ -0,0 +1,75 @@ +## +## IMAP specific settings +## + +# If nothing happens for this long while client is IDLEing, move the connection +# to imap-hibernate process and close the old imap process. This saves memory, +# because connections use very little memory in imap-hibernate process. The +# downside is that recreating the imap process back uses some resources. +#imap_hibernate_timeout = 0 + +# 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 +# %{fetch_hdr_count} - Number of mails with mail header data sent to client +# %{fetch_hdr_bytes} - Number of bytes with mail header data sent to client +# %{fetch_body_count} - Number of mails with mail body data sent to client +# %{fetch_body_bytes} - Number of bytes with mail body data sent to client +# %{deleted} - Number of mails where client added \Deleted flag +# %{expunged} - Number of mails that client expunged +# %{trashed} - Number of mails that client copied/moved to the +# special_use=\Trash mailbox. +#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 ( + +## +## 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={{postfix.dovecot.quota.general}} + quota_rule2 = Trash:storage={{postfix.dovecot.quota.trash}} + + # 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 excecuted, 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 /etc/dovecot/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/roles/email/templates/dovecot/conf.d/auth-sql.conf.ext b/roles/email/templates/dovecot/conf.d/auth-sql.conf.ext new file mode 100644 index 0000000..7e06a4f --- /dev/null +++ b/roles/email/templates/dovecot/conf.d/auth-sql.conf.ext @@ -0,0 +1,30 @@ +# 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/roles/email/templates/dovecot/dovecot-sql.conf.ext b/roles/email/templates/dovecot/dovecot-sql.conf.ext new file mode 100644 index 0000000..1aca7d9 --- /dev/null +++ b/roles/email/templates/dovecot/dovecot-sql.conf.ext @@ -0,0 +1,144 @@ +# This file is commonly accessed via passdb {} or userdb {} section in +# conf.d/auth-sql.conf.ext + +# This file is opened as root, so it should be owned by root and mode 0600. +# +# http://wiki2.dovecot.org/AuthDatabase/SQL +# +# For the sql passdb module, you'll need a database with a table that +# contains fields for at least the username and password. If you want to +# use the user@domain syntax, you might want to have a separate domain +# field as well. +# +# If your users all have the same uig/gid, and have predictable home +# directories, you can use the static userdb module to generate the home +# dir based on the username and domain. In this case, you won't need fields +# for home, uid, or gid in the database. +# +# If you prefer to use the sql userdb module, you'll want to add fields +# for home, uid, and gid. Here is an example table: +# +# CREATE TABLE users ( +# username VARCHAR(128) NOT NULL, +# domain VARCHAR(128) NOT NULL, +# password VARCHAR(64) NOT NULL, +# home VARCHAR(255) NOT NULL, +# uid INTEGER NOT NULL, +# gid INTEGER NOT NULL, +# active CHAR(1) DEFAULT 'Y' NOT NULL +# ); + +# Database driver: mysql, pgsql, sqlite +driver = mysql + +# Database connection string. This is driver-specific setting. +# +# HA / round-robin load-balancing is supported by giving multiple host +# settings, like: host=sql1.host.org host=sql2.host.org +# +# pgsql: +# For available options, see the PostgreSQL documention for the +# PQconnectdb function of libpq. +# Use maxconns=n (default 5) to change how many connections Dovecot can +# create to pgsql. +# +# mysql: +# Basic options emulate PostgreSQL option names: +# host, port, user, password, dbname +# +# But also adds some new settings: +# client_flags - See MySQL manual +# ssl_ca, ssl_ca_path - Set either one or both to enable SSL +# ssl_cert, ssl_key - For sending client-side certificates to server +# ssl_cipher - Set minimum allowed cipher security (default: HIGH) +# ssl_verify_server_cert - Verify that the name in the server SSL certificate +# matches the host (default: no) +# option_file - Read options from the given file instead of +# the default my.cnf location +# option_group - Read options from the given group (default: client) +# +# You can connect to UNIX sockets by using host: host=/var/run/mysql.sock +# Note that currently you can't use spaces in parameters. +# +# sqlite: +# The path to the database file. +# +# Examples: +# connect = host=192.168.1.1 dbname=users +# connect = host=sql.example.com dbname=virtual user=virtual password=blarg +# connect = /etc/dovecot/authdb.sqlite +# +connect = host=localhost dbname=vmail user=vmail password={{postfix.dovecot.mysql_password}} + +# Default password scheme. +# +# List of supported schemes is in +# http://wiki2.dovecot.org/Authentication/PasswordSchemes +# +default_pass_scheme = SSHA + +# passdb query to retrieve the password. It can return fields: +# password - The user's password. This field must be returned. +# user - user@domain from the database. Needed with case-insensitive lookups. +# username and domain - An alternative way to represent the "user" field. +# +# The "user" field is often necessary with case-insensitive lookups to avoid +# e.g. "name" and "nAme" logins creating two different mail directories. If +# your user and domain names are in separate fields, you can return "username" +# and "domain" fields instead of "user". +# +# The query can also return other fields which have a special meaning, see +# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields +# +# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables +# for full list): +# %u = entire user@domain +# %n = user part of user@domain +# %d = domain part of user@domain +# +# Note that these can be used only as input to SQL query. If the query outputs +# any of these substitutions, they're not touched. Otherwise it would be +# difficult to have eg. usernames containing '%' characters. +# +# Example: +# password_query = SELECT userid AS user, pw AS password \ +# FROM users WHERE userid = '%u' AND active = 'Y' +# +#password_query = \ +# SELECT username, domain, password \ +# FROM users WHERE username = '%n' AND domain = '%d' + +# userdb query to retrieve the user information. It can return fields: +# uid - System UID (overrides mail_uid setting) +# gid - System GID (overrides mail_gid setting) +# home - Home directory +# mail - Mail location (overrides mail_location setting) +# +# None of these are strictly required. If you use a single UID and GID, and +# home or mail directory fits to a template string, you could use userdb static +# instead. For a list of all fields that can be returned, see +# http://wiki2.dovecot.org/UserDatabase/ExtraFields +# +# Examples: +# user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' +# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' +# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' +# +#user_query = \ +# SELECT home, uid, gid \ +# FROM users WHERE username = '%n' AND domain = '%d' +user_query = SELECT '/var/vmail/%u' as home, 'maildir:/var/vmail/%u' as mail, {{postfix.dovecot.vmail_uid}} AS uid, {{postfix.dovecot.mail_gid}} AS gid FROM users WHERE username = '%u' AND active = '1' + +# If you wish to avoid two SQL lookups (passdb + userdb), you can use +# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll +# also have to return userdb fields in password_query prefixed with "userdb_" +# string. For example: +#password_query = \ +# SELECT userid AS user, password, \ +# home AS userdb_home, uid AS userdb_uid, gid AS userdb_gid \ +# FROM users WHERE userid = '%u' +password_query = SELECT username as user, password, '/var/vmail/%u' as userdb_home, 'maildir:/var/vmail/%u' as userdb_mail, {{postfix.dovecot.vmail_uid}} as userdb_uid, {{postfix.dovecot.mail_gid}} as userdb_gid \ + FROM users WHERE username = '%u' AND active = '1' + +# Query to get a list of all usernames. +iterate_query = SELECT username AS user FROM users WHERE active = '1' diff --git a/roles/email/templates/dovecot/quota-warning.sh b/roles/email/templates/dovecot/quota-warning.sh new file mode 100644 index 0000000..00c09f8 --- /dev/null +++ b/roles/email/templates/dovecot/quota-warning.sh @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +PERCENT=$1 +FROM="{{postfix.dovecot.postmaster}}" + +msg="From: $FROM +To: $USER +CC: $FROM +Subject: Dein Posteingang ist $PERCENT% voll / Your mailbox is $PERCENT% full +Content-Type: text/plain; charset=UTF-8 + +Dein Posteingang ist zu $PERCENT% voll. Bitte räume etwas auf! + +Your mailbox is now $PERCENT% full. Please clean it up a bit!" + +echo -e "$msg" | /usr/sbin/sendmail -f "$FROM" "$USER" "$FROM" + +exit 0 diff --git a/roles/email/templates/main.cf b/roles/email/templates/main.cf index 4488ec4..1049ed2 100644 --- a/roles/email/templates/main.cf +++ b/roles/email/templates/main.cf @@ -81,27 +81,28 @@ relay_clientcerts = hash:$config_directory/{{ postfix.relay_client_cert_whitelis {% if postfix.virtual_mailbox_domains is defined %} # setup virtual delivery domains, aliases and destinations -virtual_mailbox_domains = {{ postfix.virtual_mailbox_domains }} +virtual_mailbox_domains ={% for item in postfix.virtual_mailbox_domains %} {{item.domain}}{% endfor %} + virtual_alias_maps = hash:$config_directory/virtual_alias_map - {% if postfix.vmail_mysql_password is defined %} + {% if postfix.dovecot is defined %} proxy:mysql:$config_directory/mysql_vmail_aliases.cf {% endif %} -# + virtual_mailbox_maps = - {% if postfix.vmail_mysql_password is defined %} + {% if postfix.dovecot is defined %} proxy:mysql:$config_directory/mysql_vmail_users.cf {% endif %} {% if postfix.mailman | default(False) %} hash:/var/lib/mailman/data/virtual-mailman {% endif %} -# + smtpd_sender_login_maps = - {% if postfix.vmail_mysql_password is defined %} + {% if postfix.dovecot is defined %} proxy:mysql:$config_directory/mysql_vmail_users.cf proxy:mysql:$config_directory/mysql_vmail_senders.cf proxy:mysql:$config_directory/mysql_vmail_aliases.cf {% endif %} -# + proxy_read_maps = $virtual_alias_maps $virtual_mailbox_maps $smtpd_sender_login_maps # setup mail routes for virtual mail: all mail ends up being forwarded somewhere @@ -110,6 +111,11 @@ transport_maps = hash:/etc/postfix/transport_map mailman_destination_recipient_limit = 1 {% endif %} +{% if postfix.smtp_outgoing is defined %} +default_transport = {{ postfix.default_smtp_outgoing }} +sender_dependent_default_transport_maps = hash:$config_directory/sender_transport_map +{% endif %} + {% if postfix.opendkim is defined %} # DKIM & Milter milter_default_action = accept diff --git a/roles/email/templates/master.cf b/roles/email/templates/master.cf index e6eeb14..f053746 100644 --- a/roles/email/templates/master.cf +++ b/roles/email/templates/master.cf @@ -41,7 +41,20 @@ verify unix - - y - 1 verify flush unix n - y 1000? 0 flush proxymap unix - - n - - proxymap proxywrite unix - - n - 1 proxymap +{% if postfix.smtp_outgoing is defined %} +{% for item in postfix.smtp_outgoing %} +{{item.name}} unix - - - - - smtp + -o smtp_helo_name={{item.hostname}} + -o smtp_bind_address={{item.ip}} +{% if item.ip_v6 is defined %} + -o smtp_bind_address6={{item.ip_v6}} +{% else %} + -o inet_protocols=ipv4 +{% endif %} +{% endfor %} +{% else %} smtp unix - - y - - smtp +{% endif %} relay unix - - y - - smtp # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 showq unix n - y - - showq diff --git a/roles/email/templates/mysql_vmail_aliases.cf b/roles/email/templates/mysql_vmail_aliases.cf index 26bae72..3fda33c 100644 --- a/roles/email/templates/mysql_vmail_aliases.cf +++ b/roles/email/templates/mysql_vmail_aliases.cf @@ -2,7 +2,7 @@ # I do not think that mapping to an alias here will work properly for the sender check, # so always map to a username. user = vmail -password = {{ postfix.vmail_mysql_password }} +password = {{ postfix.dovecot.mysql_password }} hosts = localhost dbname = vmail query = SELECT user FROM aliases WHERE mail='%s' diff --git a/roles/email/templates/mysql_vmail_senders.cf b/roles/email/templates/mysql_vmail_senders.cf index de5dcd6..5d76cb0 100644 --- a/roles/email/templates/mysql_vmail_senders.cf +++ b/roles/email/templates/mysql_vmail_senders.cf @@ -2,7 +2,7 @@ # I do not think that mapping to an alias here will work properly for the sender check, # so always map to a username. user = vmail -password = {{ postfix.vmail_mysql_password }} +password = {{ postfix.dovecot.mysql_password }} hosts = localhost dbname = vmail query = SELECT user FROM senders WHERE sender='%s' diff --git a/roles/email/templates/mysql_vmail_users.cf b/roles/email/templates/mysql_vmail_users.cf index 7ddb1f4..7541247 100644 --- a/roles/email/templates/mysql_vmail_users.cf +++ b/roles/email/templates/mysql_vmail_users.cf @@ -1,6 +1,7 @@ +# This is used to check the existance of email addresses (so return *something* for existing addresses, and nothing for others). # It is also used to check ownership, mapping email addresses to usernames - however, in my setup, the email address is the username. user = vmail -password = {{ postfix.vmail_mysql_password }} +password = {{ postfix.dovecot.mysql_password }} hosts = localhost dbname = vmail query = SELECT username FROM users WHERE username='%s' AND active = '1' diff --git a/roles/email/templates/transport_map b/roles/email/templates/transport_map new file mode 100644 index 0000000..1d025de --- /dev/null +++ b/roles/email/templates/transport_map @@ -0,0 +1,3 @@ +{% for item in postfix.virtual_mailbox_domains %} +{{item.domain}} {{item.transport}} +{% endfor %} diff --git a/roles/etherpad/tasks/main.yml b/roles/etherpad/tasks/main.yml index 82c9e1f..e4ce596 100644 --- a/roles/etherpad/tasks/main.yml +++ b/roles/etherpad/tasks/main.yml @@ -4,7 +4,10 @@ system: yes group: nogroup home: /var/lib/nodejs + create_home: no shell: /bin/false +- name: create nodejs dir + file: path=/var/lib/nodejs state=directory owner=nodejs group=nogroup - name: create etherpad dir file: path=/srv/{{etherpad.domain}} state=directory owner=nodejs group=www-data - name: check out etherpad sources -- 2.30.2