From fbfb04717aab598bdfe158afacfeaa80df22496f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ibu=20=E2=98=89=20radempa?= Date: Sun, 22 Mar 2026 13:09:26 +0100 Subject: [PATCH] Update to trixie --- LICENSE.txt | 2 +- journal-postfix.yml | 2 +- journal-postfix/files/srv/settings.py | 3 +- journal-postfix/tasks/main.yml | 77 +-- journal-postfix/templates/main.yml | 4 +- mail_system.yml | 78 ++- mail_system/README.md | 28 + mail_system/defaults/main.yml | 2 + .../dovecot/sieve/after/README} | 0 .../dovecot/sieve/after}/spam-to-folder.sieve | 0 .../dovecot/sieve/after/spam-to-folder.svbin | Bin 0 -> 317 bytes .../dovecot/sieve/before/README} | 0 .../dovecot/sieve/execute/README} | 0 .../dovecot/sieve/filters/README} | 0 .../files/dovecot/sieve/pipes/learn-ham.sieve | 8 + .../files/dovecot/sieve/pipes/learn-ham.svbin | Bin 0 -> 347 bytes .../dovecot/sieve/pipes/learn-spam.sieve | 5 + .../dovecot/sieve/pipes/learn-spam.svbin | Bin 0 -> 291 bytes .../dovecot/sieve/pipes/rspamd-learn-ham.sh | 3 + .../dovecot/sieve/pipes/rspamd-learn-spam.sh | 3 + mail_system/meta/main.yml | 16 + mail_system/tasks/clamav.yml | 39 +- mail_system/tasks/database.yml | 166 +++--- mail_system/tasks/dovecot.yml | 169 +++--- mail_system/tasks/main.yml | 18 +- mail_system/tasks/postfix.yml | 62 ++- mail_system/tasks/remove_other_mtas.yml | 15 +- mail_system/tasks/rspamd.yml | 46 +- mail_system/templates/dovecot/10-auth.conf | 131 ----- mail_system/templates/dovecot/10-mail.conf | 461 ----------------- mail_system/templates/dovecot/10-master.conf | 154 ------ mail_system/templates/dovecot/10-ssl.conf | 84 --- .../templates/dovecot/15-mailboxes.conf | 93 ---- mail_system/templates/dovecot/20-imap.conf | 103 ---- mail_system/templates/dovecot/20-lmtp.conf | 44 -- mail_system/templates/dovecot/90-acl.conf | 24 - mail_system/templates/dovecot/90-plugin.conf | 18 - mail_system/templates/dovecot/90-quota.conf | 107 ---- .../dovecot/90-sieve-extprograms.conf | 49 -- mail_system/templates/dovecot/90-sieve.conf | 234 --------- .../templates/dovecot/auth-sql.conf.ext | 42 -- .../dovecot/dovecot-dict-sql.conf.ext | 65 --- .../templates/dovecot/dovecot-sql.conf.ext | 174 ------- mail_system/templates/dovecot/dovecot.conf | 107 ---- mail_system/templates/dovecot/local.conf | 484 ++++++++++++++++++ .../templates/dovecot/quota-warning.sh | 6 + .../templates/dovecot/rspamd-learn-ham.sh | 2 - .../templates/dovecot/rspamd-learn-spam.sh | 2 - 48 files changed, 914 insertions(+), 2216 deletions(-) create mode 100644 mail_system/README.md create mode 100644 mail_system/defaults/main.yml rename mail_system/{templates/dovecot/README_after => files/dovecot/sieve/after/README} (100%) rename mail_system/{templates/dovecot => files/dovecot/sieve/after}/spam-to-folder.sieve (100%) create mode 100644 mail_system/files/dovecot/sieve/after/spam-to-folder.svbin rename mail_system/{templates/dovecot/README_before => files/dovecot/sieve/before/README} (100%) rename mail_system/{templates/dovecot/README_execute => files/dovecot/sieve/execute/README} (100%) rename mail_system/{templates/dovecot/README_filters => files/dovecot/sieve/filters/README} (100%) create mode 100644 mail_system/files/dovecot/sieve/pipes/learn-ham.sieve create mode 100644 mail_system/files/dovecot/sieve/pipes/learn-ham.svbin create mode 100644 mail_system/files/dovecot/sieve/pipes/learn-spam.sieve create mode 100644 mail_system/files/dovecot/sieve/pipes/learn-spam.svbin create mode 100755 mail_system/files/dovecot/sieve/pipes/rspamd-learn-ham.sh create mode 100755 mail_system/files/dovecot/sieve/pipes/rspamd-learn-spam.sh create mode 100644 mail_system/meta/main.yml delete mode 100644 mail_system/templates/dovecot/10-auth.conf delete mode 100644 mail_system/templates/dovecot/10-mail.conf delete mode 100644 mail_system/templates/dovecot/10-master.conf delete mode 100644 mail_system/templates/dovecot/10-ssl.conf delete mode 100644 mail_system/templates/dovecot/15-mailboxes.conf delete mode 100644 mail_system/templates/dovecot/20-imap.conf delete mode 100644 mail_system/templates/dovecot/20-lmtp.conf delete mode 100644 mail_system/templates/dovecot/90-acl.conf delete mode 100644 mail_system/templates/dovecot/90-plugin.conf delete mode 100644 mail_system/templates/dovecot/90-quota.conf delete mode 100644 mail_system/templates/dovecot/90-sieve-extprograms.conf delete mode 100644 mail_system/templates/dovecot/90-sieve.conf delete mode 100644 mail_system/templates/dovecot/auth-sql.conf.ext delete mode 100644 mail_system/templates/dovecot/dovecot-dict-sql.conf.ext delete mode 100644 mail_system/templates/dovecot/dovecot-sql.conf.ext delete mode 100644 mail_system/templates/dovecot/dovecot.conf create mode 100644 mail_system/templates/dovecot/local.conf create mode 100644 mail_system/templates/dovecot/quota-warning.sh delete mode 100644 mail_system/templates/dovecot/rspamd-learn-ham.sh delete mode 100644 mail_system/templates/dovecot/rspamd-learn-spam.sh diff --git a/LICENSE.txt b/LICENSE.txt index 1e54ae7..ed86d78 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 ibu radempa +Copyright (c) 2026 ibu radempa Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/journal-postfix.yml b/journal-postfix.yml index 3fa8a78..fad4213 100644 --- a/journal-postfix.yml +++ b/journal-postfix.yml @@ -27,7 +27,7 @@ # on the destination hosts and run systemctl start journal-postfix # manually. -- name: install journal-postfix +- name: Install journal-postfix user: root hosts: mail roles: diff --git a/journal-postfix/files/srv/settings.py b/journal-postfix/files/srv/settings.py index 4fde5df..cf7a1d1 100755 --- a/journal-postfix/files/srv/settings.py +++ b/journal-postfix/files/srv/settings.py @@ -9,6 +9,7 @@ import datetime from typing import Union, Optional from systemd import journal from yaml import load +from yaml import CLoader as Loader main_config_file: str = '/etc/journal-postfix/main.yml' @@ -85,7 +86,7 @@ def get_config() -> Optional[dict]: journal.send(msg, PRIORITY=journal.LOG_CRIT) return None try: - config = load(config_raw) + config = load(config_raw, Loader=Loader) except Exception as err: msg = f'ERROR: invalid yaml syntax in {filename}: {err}' journal.send(msg, PRIORITY=journal.LOG_CRIT) diff --git a/journal-postfix/tasks/main.yml b/journal-postfix/tasks/main.yml index aa8d5fd..214e3b8 100644 --- a/journal-postfix/tasks/main.yml +++ b/journal-postfix/tasks/main.yml @@ -1,42 +1,42 @@ -- name: user journal-postfix - user: +- name: User journal-postfix + ansible.builtin.user: name: journal-postfix group: systemd-journal state: present - system: yes + system: true uid: 420 - create_home: no + create_home: false home: /srv/journal-postfix password: '!' - password_lock: yes + password_lock: true comment: created by ansible role journal-postfix -- name: directories /srv/journal-postfix, /etc/journal-postfix - file: +- name: Directories /srv/journal-postfix, /etc/journal-postfix + ansible.builtin.file: path: "{{ item }}" state: directory owner: journal-postfix group: systemd-journal - mode: 0755 + mode: "0755" loop: - /srv/journal-postfix - /etc/journal-postfix -- name: install dependencies - apt: +- name: Install dependencies + ansible.builtin.apt: name: python3-psycopg2,python3-systemd,python3-yaml state: present - update_cache: yes - install_recommends: no + update_cache: true + install_recommends: false -- name: files in /srv/journal-postfix - copy: +- name: Files in /srv/journal-postfix + ansible.builtin.copy: src: "srv/{{ item }}" dest: "/srv/journal-postfix/{{ item }}" owner: journal-postfix group: systemd-journal - mode: 0644 - force: yes + mode: "0644" + force: true loop: - run.py - settings.py @@ -47,44 +47,49 @@ - README.md - setup.cfg -- name: make some files executable - file: +- name: Make some files executable + ansible.builtin.file: path: "{{ item }}" - mode: 0755 + mode: "0755" loop: - /srv/journal-postfix/run.py - /srv/journal-postfix/settings.py -- name: determine whether to startup - set_fact: - startup: "{{ mailserver.postgresql.host is defined and mailserver.postgresql.port is defined and mailserver.postgresql.dbname is defined and mailserver.postgresql.username is defined and mailserver.postgresql.password is defined }}" +- name: Determine whether to startup + ansible.builtin.set_fact: + startup: >- + {{ (mailserver.postgresql.host is defined + and mailserver.postgresql.port is defined + and mailserver.postgresql.dbname is defined + and mailserver.postgresql.username is defined + and mailserver.postgresql.password is defined) | bool }} -- name: file /etc/journal-postfix/main.yml - template: +- name: File /etc/journal-postfix/main.yml + ansible.builtin.template: src: main.yml dest: /etc/journal-postfix/main.yml owner: journal-postfix group: systemd-journal - mode: 0600 - force: no + mode: "0600" + force: false -- name: file journal-postfix.service - copy: +- name: File journal-postfix.service + ansible.builtin.copy: src: journal-postfix.service dest: /etc/systemd/system/journal-postfix.service owner: root group: root - mode: 0644 - force: yes + mode: "0644" + force: true -- name: enable systemd unit journal-postfix.service - systemd: - enabled: yes - daemon_reload: yes +- name: Enable systemd unit journal-postfix.service + ansible.builtin.systemd: + enabled: true + daemon_reload: true name: journal-postfix.service -- name: restart systemd unit journal-postfix.service - systemd: +- name: Restart systemd unit journal-postfix.service + ansible.builtin.systemd: state: restarted name: journal-postfix.service when: startup diff --git a/journal-postfix/templates/main.yml b/journal-postfix/templates/main.yml index 49dc266..dd63832 100644 --- a/journal-postfix/templates/main.yml +++ b/journal-postfix/templates/main.yml @@ -1,7 +1,7 @@ # Configuration for journal-postfix, see /srv/journal-postfix -# To enable startup of systemd unit journal-postfix set this to yes: -startup: {{ 'yes' if startup else 'no' }} +# startup of systemd unit journal-postfix +startup: true if startup else false # PostgreSQL database connection parameters postgresql: diff --git a/mail_system.yml b/mail_system.yml index eafb54c..1ba9eaf 100644 --- a/mail_system.yml +++ b/mail_system.yml @@ -32,39 +32,91 @@ # verp_marker: rstxyz # dovecot: # auth_default_realm: mymaindomain.org +# postmaster_email: root@mymaindomain.org # -# Take care thate the verp_marker only contains [a-z0-9]+ (NO UPPER CASE LETTERS!). +# Setup a Postgresql database (named as in dbname, owned by username, reachable on +# host and port) with something like that: # -# (Use ansible-vault encrypt_string to encrypt the password.) +# createuser -P mailserver +# createdb -E utf8 -O mailserver -T template1 mailserver +# +# Use `ansible-vault encrypt_string` to obtain the encrypted password. +# +# Take care that the verp_marker only contains [a-z0-9]+ (NO UPPER CASE LETTERS!). # # TODOs after running this playbook: # -# Open the firewall: -# -# - open or DNAT the TCP ports 25, 143, 587, 4190 to the host (incoming) -# - allow outgoing traffic -# -# Configure mail DNS for your host: +# Configure mail DNS: # # - MX # - PTR (IPv4 and IPv6) # -# Add SPF, DMARC and DKIM DNS records whenever you add a mail domain: +# SPF, DMARC and DKIM DNS records should be created when adding a domain: # -# - SPF ('IN TXT "v=spf1 mx"' or more) -# - DMARC ('_dmarc IN TXT "v=DMARC1; p=reject; rua=mailto:admin@mymaindomain.org; adkim=s; aspf=s;"') +# - SPF (`IN TXT "v=spf1 mx" or more`) +# - DMARC (`_dmarc IN TXT "v=DMARC1; p=reject; rua=mailto:admin@mymaindomain.org; adkim=s; aspf=s;"`) # - DKIM (rspamadm dkim_keygen -d mymaindomain.org -s 20190911 -b 4096; -# get the DNS entry and also save the private key) +# put the DNS entry in your zone file and save the private key +# into /var/lib/rspamd/dkim/mymaindomain.org.20190911.key +# and +# chown _rspamd /var/lib/rspamd/dkim/* +# chmod 400 /var/lib/rspamd/dkim/* +# and enable it by putting a line +# mymaindomain.org 20190911 +# into /etc/rspamd/dkim_selectors.map +# followed by systemctl reload rspamd) # -# Replace the ssl certificates with signed ones. +# Please open the firewall: open or DNAT tcp ports 25, 143, 587, 4190 to the host (incoming) +# +# Replace the dovecot and postfix ssl certificates in /etc/dovecot/private with signed ones. # # Users and domains can be added to the PostgreSQL tables; # code for that is not part of this playbook. +# +# - put the domain name in table domains +# - create a user in table users using `doveadm pw -s PBKDF2` +# - create aliases +# +# # Mind that if you create a catchall alias, you must also # add an alias for each account to the aliases, or you can # prepend the following to the SELECT in /etc/postfix/aliases.cf # SELECT u.username || '@' || d.name FROM users u JOIN domains d ON u.domain_id=d.id WHERE d.relay_transport is null AND u.username || '@' || d.name = '%s' # UNION +# +# Users should use the following parameters for IMAP and mail submission. +# Note you will need to use the server_name for which you have installed the ssl certificates. +# Or you will have to configure dovecot to use multiple certs: +# https://doc.dovecot.org/configuration_manual/dovecot_ssl_configuration/#with-client-tls-sni-server-name-indication-support +# +# IMAP: +# +# - server_name: mail.mydomain.org +# - port: 143 +# - connection_security: starttls +# - auth_method: normal password +# - username: {user}@{configured_domain} +# +# Mail submission: +# +# - server_name: mail.mydomain.org +# - port: 587 +# - connection_security: starttls +# - auth_method: normal password +# - username: {user}@{configured_domain} +# +# UPGRADING to the trixie version: +# +# Note that the database schema has slightly changed. +# +# When installing on a new host, transfer this data: +# * postgres db `mailserver` (data only, not schema) +# * contents of /var/lib/rspamd/dkim/ +# * /etc/rspamd/dkim_selectors.map +# * /srv/mailstore (keep uid:gid 5000:5000) +# * tls key(s) and certificate(s) for postgres and dovecot +# +# And open the firewall. If the external IPs have changed, also update DNS entries. - name: install mail_system user: root diff --git a/mail_system/README.md b/mail_system/README.md new file mode 100644 index 0000000..cf372c3 --- /dev/null +++ b/mail_system/README.md @@ -0,0 +1,28 @@ +# Ansible role: mailserver + +Installs a mailsystem on debian trixie. + +## Requirements + +TODO + +## Role variables + +TODO + +## Dependencies + + - community.general + - community.postgresql + +## Example playbook + +See `../mail_system.yml`. + +## License + +MIT + +## Author Information + +@ibu:matrix.multiname.org diff --git a/mail_system/defaults/main.yml b/mail_system/defaults/main.yml new file mode 100644 index 0000000..c72d4ea --- /dev/null +++ b/mail_system/defaults/main.yml @@ -0,0 +1,2 @@ +--- +mailserver_version: 0.3.0 diff --git a/mail_system/templates/dovecot/README_after b/mail_system/files/dovecot/sieve/after/README similarity index 100% rename from mail_system/templates/dovecot/README_after rename to mail_system/files/dovecot/sieve/after/README diff --git a/mail_system/templates/dovecot/spam-to-folder.sieve b/mail_system/files/dovecot/sieve/after/spam-to-folder.sieve similarity index 100% rename from mail_system/templates/dovecot/spam-to-folder.sieve rename to mail_system/files/dovecot/sieve/after/spam-to-folder.sieve diff --git a/mail_system/files/dovecot/sieve/after/spam-to-folder.svbin b/mail_system/files/dovecot/sieve/after/spam-to-folder.svbin new file mode 100644 index 0000000000000000000000000000000000000000..634bfd1a9b842e251952e3c1bc314a1a55a51166 GIT binary patch literal 317 zcmaJ-F%H5o40MvV&;cYikXYDQLey`tAr=^0nu>_DL2amb8v_#)@8BJP6SV^imQS{G zXUEC?_I@$|2oOueKieRA>;wek6!GY4ijgB;UF~Mh5OXK&%=HI_(h?v{3oC0FH|MnE z*6_mU9P321X)UzML~dGnFjh25wo-Vt_!X}_*8^eS^ s3^XJ_qaEMka}>b`_y9kU+DHSb4UH82lP~b#1AL2bP$!y#Cl`ig zvOBZ8xm}<4n20zq1OCMd#WFN71X%mV5MIys+Ndv|i&i$m=v)+a zt9JEKIIUVGthUMtqhxbfl(Nb`uU^v4eqc5l3^?HM`Mm9(8C#RM&Lqny`w zJH|McfyE!kVXu=~yO J^@+hbqBqc+H)Q|- literal 0 HcmV?d00001 diff --git a/mail_system/files/dovecot/sieve/pipes/learn-spam.sieve b/mail_system/files/dovecot/sieve/pipes/learn-spam.sieve new file mode 100644 index 0000000..563efff --- /dev/null +++ b/mail_system/files/dovecot/sieve/pipes/learn-spam.sieve @@ -0,0 +1,5 @@ +# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! + + +require ["vnd.dovecot.pipe", "copy", "imapsieve"]; +pipe :copy "rspamd-learn-spam.sh"; diff --git a/mail_system/files/dovecot/sieve/pipes/learn-spam.svbin b/mail_system/files/dovecot/sieve/pipes/learn-spam.svbin new file mode 100644 index 0000000000000000000000000000000000000000..a382e94b9f119744966921017ac4f4e7aa05ac57 GIT binary patch literal 291 zcmdnD>)$D61_lNeAl3k4e837QnE_S62&A=ucny@#1f*4g_yLp;GLsvK1waa+0HmKK zEi)$-!q?R=ODxjQ$xPBu$uCPy&M(m~&P**!)i1~_NG;aSNlh%u(=9GY%+&)61NFe{ zWELpPOVNXB(gP_68JwJ7Pzj_tGjkIQU^*BWVD4fDI*1X-<7N2I$-pF11Tr{97ugbs T&tUFmVrArDU}R=sWMTjS+A=O% literal 0 HcmV?d00001 diff --git a/mail_system/files/dovecot/sieve/pipes/rspamd-learn-ham.sh b/mail_system/files/dovecot/sieve/pipes/rspamd-learn-ham.sh new file mode 100755 index 0000000..b523a72 --- /dev/null +++ b/mail_system/files/dovecot/sieve/pipes/rspamd-learn-ham.sh @@ -0,0 +1,3 @@ +#!/bin/sh +/usr/bin/rspamc learn_ham +exit 0 diff --git a/mail_system/files/dovecot/sieve/pipes/rspamd-learn-spam.sh b/mail_system/files/dovecot/sieve/pipes/rspamd-learn-spam.sh new file mode 100755 index 0000000..e4df61d --- /dev/null +++ b/mail_system/files/dovecot/sieve/pipes/rspamd-learn-spam.sh @@ -0,0 +1,3 @@ +#!/bin/sh +/usr/bin/rspamc learn_spam +exit 0 diff --git a/mail_system/meta/main.yml b/mail_system/meta/main.yml new file mode 100644 index 0000000..1f36556 --- /dev/null +++ b/mail_system/meta/main.yml @@ -0,0 +1,16 @@ +--- +galaxy_info: + role_name: mail_system + namespace: TODO + author: ibu radempa + description: Install a mail system with postfix, dovecot, rspamd. + issue_tracker_url: TODO + license: MIT + min_ansible_version: 2.19 +dependencies: +# - community.general +# - community.postgresql + +argument_specs: + main: + TODO diff --git a/mail_system/tasks/clamav.yml b/mail_system/tasks/clamav.yml index 216b5e1..c76f2ab 100644 --- a/mail_system/tasks/clamav.yml +++ b/mail_system/tasks/clamav.yml @@ -2,49 +2,50 @@ # we run freshclam (with daemons stopped) and then starting the daemons should work # (avoiding 'clamav-daemon not started: "ConditionPathExistsGlob=/var/lib/clamav/daily.{c[vl]d,inc} was not met"') -- name: install clamav - apt: +- name: Install clamav + ansible.builtin.apt: name: "{{ packages }}" vars: packages: - - clamav - - clamav-daemon - - clamav-freshclam + - clamav + - clamav-daemon + - clamav-freshclam -- name: stop clamav daemons - systemd: +- name: Stop clamav daemons + ansible.builtin.systemd: name: "{{ item }}" state: stopped loop: - clamav-freshclam - clamav-daemon -- name: run freshclam - shell: freshclam +- name: Run freshclam + ansible.builtin.command: freshclam + register: out + changed_when: out.rc != 0 -- name: start clamav daemons - systemd: +- name: Start clamav daemons + ansible.builtin.systemd: name: "{{ item }}" state: started loop: - clamav-daemon - clamav-freshclam -- name: install clamav-unofficial-sigs, clamdscan - apt: +- name: Install clamdscan + ansible.builtin.apt: name: "{{ packages }}" vars: packages: - - clamav-unofficial-sigs - - clamdscan + - clamdscan -- name: set clamav BytecodeSecurity to Paranoid - lineinfile: +- name: Set clamav BytecodeSecurity to Paranoid + ansible.builtin.lineinfile: path: /etc/clamav/clamd.conf regexp: '^BytecodeSecurity' line: 'BytecodeSecurity Paranoid' -- name: restart clamav-daemon - systemd: +- name: Restart clamav-daemon + ansible.builtin.systemd: name: clamav-daemon state: restarted diff --git a/mail_system/tasks/database.yml b/mail_system/tasks/database.yml index f56f26b..94e104f 100644 --- a/mail_system/tasks/database.yml +++ b/mail_system/tasks/database.yml @@ -1,173 +1,175 @@ -- name: apt install python3-psycopg2 - apt: +- name: Install package python3-psycopg2 + ansible.builtin.apt: name: python3-psycopg2 state: present -- name: database table domains - postgresql_table: +- name: Database table domains + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: domains columns: - - id bigserial primary key - - name varchar(128) not null unique - - relay_transport text null + - id BIGSERIAL PRIMARY KEY + - name VARCHAR(128) NOT NULL UNIQUE + - relay_transport TEXT NULL -- name: database table users - postgresql_table: +- name: Database table users + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: users columns: - - id BIGSERIAL PRIMARY KEY - - domain_id BIGINT references domains(id) on delete cascade - - username VARCHAR(128) NOT NULL - - realname VARCHAR(250) NOT NULL - - password VARCHAR(128) NOT NULL - - suspend_submission BOOL NOT NULL DEFAULT false - - suspend_imap_reason TEXT NULL - - quota_storage_bytes BIGINT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_bytes | default(100000000000) }} - - quota_inbox_messages INT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_messages | default(500000) }} - - unique(domain_id, username) + - id BIGSERIAL PRIMARY KEY + - domain_id BIGINT references domains(id) on delete cascade + - username VARCHAR(128) NOT NULL + - realname VARCHAR(250) NOT NULL + - password VARCHAR(128) NOT NULL + - suspend_submission BOOL NOT NULL DEFAULT false + - suspend_imap_reason TEXT NULL + - quota_storage_bytes BIGINT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_bytes | default(100000000000) }} + - quota_inbox_messages INT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_messages | default(500000) }} + - unique(domain_id, username) -- name: database index users__domain_username - postgresql_idx: +- name: Database index users__domain_username + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: users columns: domain_id, username idxname: users__domain_username -- name: database table aliases - postgresql_table: +- name: Database table aliases + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: aliases columns: - - id bigserial primary key - - alias_domain_id bigint references domains(id) on delete cascade - - alias varchar(250) not null - - forwardings varchar(250)[] not null - - t timestamp without time zone not null default now() - - comment text null - - unique(alias_domain_id, alias) + - id bigserial primary key + - alias_domain_id bigint references domains(id) on delete cascade + - alias varchar(250) not null + - forwardings varchar(250)[] not null + - t timestamp without time zone not null default now() + - comment text null + - unique(alias_domain_id, alias) -- name: database index aliases__alias - postgresql_idx: +- name: Database index aliases__alias + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: aliases columns: alias idxname: aliases__alias -- name: database table shared_folders - postgresql_table: +- name: Database table shared_folders + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: shared_folders columns: - - id bigserial primary key - - from_user varchar(128) not null - - to_user varchar(128) not null - - dummy char(1) DEFAULT '1' + - id bigserial primary key + - from_user varchar(128) not null + - to_user varchar(128) not null + - dummy char(1) DEFAULT '1' -- name: database index shared_folders__from_to - postgresql_idx: +- name: Database index shared_folders__from_to + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: shared_folders columns: from_user, to_user idxname: shared_folders__from_to + unique: true -- name: database table shared_folders_anyone - postgresql_table: +- name: Database table shared_folders_anyone + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: shared_folders_anyone columns: - - id bigserial primary key - - from_user varchar(128) not null - - dummy char(1) DEFAULT '1' + - id bigserial primary key + - from_user varchar(128) not null + - dummy char(1) DEFAULT '1' -- name: database index shared_folders_anyone__from - postgresql_idx: +- name: Database index shared_folders_anyone__from + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: shared_folders_anyone columns: from_user idxname: shared_folders__from + unique: true -- name: database table mail_from - postgresql_table: +- name: Database table mail_from + community.postgresql.postgresql_table: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable name: mail_from columns: - - id bigserial primary key - - t timestamp default now() - - original varchar(250) not null - - rewritten varchar(250) not null - - srs_id bigint + - id bigserial primary key + - t timestamp default now() + - original varchar(250) not null + - rewritten varchar(250) not null + - srs_id bigint -- name: database index mail_from__rewritten - postgresql_idx: +- name: Database index mail_from__rewritten + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: mail_from columns: rewritten idxname: mail_from__rewritten -- name: database index mail_from__srs_id - postgresql_idx: +- name: Database index mail_from__srs_id + community.postgresql.postgresql_idx: login_host: "{{ mailserver.postgresql.host }}" - port: "{{ mailserver.postgresql.port }}" + login_port: "{{ mailserver.postgresql.port }}" login_user: "{{ mailserver.postgresql.username }}" login_password: "{{ mailserver.postgresql.password }}" - db: "{{ mailserver.postgresql.dbname }}" + login_db: "{{ mailserver.postgresql.dbname }}" ssl_mode: disable table: mail_from columns: srs_id diff --git a/mail_system/tasks/dovecot.yml b/mail_system/tasks/dovecot.yml index 0b4d26f..c056f4d 100644 --- a/mail_system/tasks/dovecot.yml +++ b/mail_system/tasks/dovecot.yml @@ -1,126 +1,87 @@ # here we assume that postfix.yml has run such that user 'mailstore' exists -- name: install dovecot packages - apt: - name: dovecot-imapd,dovecot-lmtpd,dovecot-pgsql,dovecot-managesieved,dovecot-lucene + +# sieve scripts + + +- name: Install dovecot packages + ansible.builtin.apt: + name: dovecot-core,dovecot-flatcurve,dovecot-imapd,dovecot-lmtpd,dovecot-managesieved,dovecot-pgsql,dovecot-sieve state: present -- name: install dovecot config files - template: - src: "dovecot/{{ item }}" - dest: "/etc/dovecot/conf.d/{{ item }}" - owner: root - group: root - mode: 0644 - force: yes - loop: - - 10-auth.conf - - auth-sql.conf.ext - - 10-mail.conf - - 10-master.conf - - 10-ssl.conf - - 15-mailboxes.conf - - 20-lmtp.conf - - 20-imap.conf - - 90-sieve.conf - - 90-sieve-extprograms.conf - - 90-plugin.conf - - 90-acl.conf - - 90-quota.conf +- name: Remove inclusion of conf.d/*.conf from dovecot.conf + ansible.builtin.lineinfile: + path: /etc/dovecot/dovecot.conf + regexp: '^!include conf\.d/\*\.conf' + line: '#!include conf.d/*.conf' -- name: install more dovecot config files - template: +- name: Set dovecot_config_version to 2.4.1 + ansible.builtin.lineinfile: + path: /etc/dovecot/dovecot.conf + regexp: '^dovecot_config_version = .*' + line: 'dovecot_config_version = 2.4.1' + +- name: Set dovecot_storage_version to 2.4.1 + ansible.builtin.lineinfile: + path: /etc/dovecot/dovecot.conf + regexp: '^dovecot_storage_version = .*' + line: 'dovecot_storage_version = 2.4.1' + +- name: Install /etc/dovecot/local.conf + ansible.builtin.template: src: "dovecot/{{ item }}" dest: "/etc/dovecot/{{ item }}" owner: root - group: dovecot - mode: 0640 - force: yes + group: root + mode: "0600" + force: true loop: - - dovecot.conf - - dovecot-sql.conf.ext - - dovecot-dict-sql.conf.ext + - local.conf -- name: directories /etc/dovecot/sieve_before /etc/dovecot/sieve_after - file: - path: "/etc/dovecot/{{ item }}" +- name: File quota-warning.sh + ansible.builtin.template: + src: dovecot/quota-warning.sh + dest: /usr/local/bin/quota-warning.sh + owner: root + group: root + mode: "0755" + force: true + +- name: Directory /var/lib/dovecot/sieve + ansible.builtin.file: + path: "/var/lib/dovecot/sieve" state: directory - owner: root - group: root - mode: 0755 - loop: - - sieve_pipes - - sieve_filters - - sieve_execute - - sieve_before - - sieve_after - -- name: file /etc/dovecot/sieve_after/spam-to-folder.sieve - template: - src: dovecot/spam-to-folder.sieve - dest: /etc/dovecot/sieve_after/spam-to-folder.sieve - owner: root - group: root - mode: 0644 - force: yes - -- name: files /etc/dovecot/sieve_pipes/*.sieve - template: - src: "dovecot/{{ item }}" - dest: "/etc/dovecot/sieve_pipes/{{ item }}" owner: mailstore group: mailstore - mode: 0600 - force: yes - loop: - - learn-spam.sieve - - learn-ham.sieve + mode: "0755" -- name: files /etc/dovecot/sieve_pipes/*.sh - template: - src: "dovecot/{{ item }}" - dest: "/etc/dovecot/sieve_pipes/{{ item }}" +- name: Copy sieve files + ansible.builtin.copy: + src: dovecot/sieve + dest: /var/lib/dovecot/ owner: mailstore group: mailstore - mode: 0700 - force: yes + mode: "0600" + directory_mode: "0755" + +- name: Directory permissions sieve pipes + ansible.builtin.file: + path: "/var/lib/dovecot/sieve/pipes" + owner: mailstore + group: mailstore + mode: "0777" + +- name: Execution flag for spam training scripts + ansible.builtin.file: + path: "/var/lib/dovecot/sieve/pipes/{{ item }}" + owner: mailstore + group: mailstore + mode: "0700" loop: - rspamd-learn-spam.sh - rspamd-learn-ham.sh -- name: README files - template: - src: "dovecot/README_{{ item }}" - dest: "/etc/dovecot/sieve_{{ item }}/README" - owner: mailstore - group: mailstore - mode: 0600 - force: yes - loop: - - filters - - execute - - before - - after - -- name: restart dovecot - systemd: +- name: Restart dovecot + ansible.builtin.systemd: name: dovecot state: restarted - -- name: compile sieve files - shell: "/usr/bin/sievec /etc/dovecot/{{ item }}" - loop: - - "sieve_after/spam-to-folder.sieve" - - "sieve_pipes/learn-spam.sieve" - - "sieve_pipes/learn-ham.sieve" - -- name: permissions of .svbin - file: - path: "/etc/dovecot/{{ item }}" - owner: mailstore - group: mailstore - mode: 0600 - loop: - - "sieve_after/spam-to-folder.sieve" - - "sieve_pipes/learn-spam.svbin" - - "sieve_pipes/learn-ham.svbin" diff --git a/mail_system/tasks/main.yml b/mail_system/tasks/main.yml index ecf7be9..abc4f3c 100644 --- a/mail_system/tasks/main.yml +++ b/mail_system/tasks/main.yml @@ -1,6 +1,12 @@ -- include: remove_other_mtas.yml -- include: database.yml -- include: postfix.yml -- include: dovecot.yml -- include: clamav.yml -- include: rspamd.yml +- name: Remove other MTAs + ansible.builtin.include_tasks: remove_other_mtas.yml +- name: Setup database tables and indexes + ansible.builtin.include_tasks: database.yml +- name: Setup postfix + ansible.builtin.include_tasks: postfix.yml +- name: Setup dovecot + ansible.builtin.include_tasks: dovecot.yml +- name: Setup clamav + ansible.builtin.include_tasks: clamav.yml +- name: Setup rspamd + ansible.builtin.include_tasks: rspamd.yml diff --git a/mail_system/tasks/postfix.yml b/mail_system/tasks/postfix.yml index e3d7e8d..ab7cb66 100644 --- a/mail_system/tasks/postfix.yml +++ b/mail_system/tasks/postfix.yml @@ -1,70 +1,76 @@ -- name: install postfix packages - apt: +- name: Install postfix packages + ansible.builtin.apt: name: postfix,postfix-pgsql,postfix-doc state: present - update_cache: yes - install_recommends: no + update_cache: true + install_recommends: false -- name: divert /etc/postfix/main.cf - shell: dpkg-divert --add --rename --divert /etc/postfix/main.cf.orig /etc/postfix/main.cf +- name: Divert /etc/postfix/main.cf + community.general.dpkg_divert: + path: /etc/postfix/main.cf + divert: /etc/postfix/main.cf.orig + rename: true -- name: divert /etc/postfix/master.cf - shell: dpkg-divert --add --rename --divert /etc/postfix/master.cf.orig /etc/postfix/master.cf +- name: Divert /etc/postfix/master.cf + community.general.dpkg_divert: + path: /etc/postfix/master.cf + divert: /etc/postfix/master.cf.orig + rename: true -- name: group 'mailstore' - group: +- name: Group 'mailstore' + ansible.builtin.group: name: mailstore state: present - system: yes + system: true gid: 5000 -- name: user 'mailstore' - user: +- name: User 'mailstore' + ansible.builtin.user: name: mailstore group: mailstore state: present shell: /usr/sbin/nologin - system: yes + system: true uid: 5000 - create_home: no + create_home: false home: /srv/mailstore password: '!' - password_lock: yes + password_lock: true comment: created by ansible -- name: directories /srv/mailstore /srv/mailstore/role_specific - file: +- name: Directories /srv/mailstore /srv/mailstore/role_specific + ansible.builtin.file: path: "{{ item }}" state: directory owner: mailstore group: mailstore - mode: 0755 + mode: "0755" loop: - /srv/mailstore - /srv/mailstore/role_specific - /srv/mailstore/role_specific/roles -- name: postfix configuration files - template: +- name: Postfix configuration files + ansible.builtin.template: src: "postfix/{{ item }}" dest: "/etc/postfix/{{ item }}" owner: root group: root - mode: 0644 + mode: "0644" force: "{{ mailserver.postfix.overwrite_config }}" loop: - main.cf - master.cf - header_checks -- name: postfix database queries - template: +- name: Postfix database queries + ansible.builtin.template: src: "postfix/{{ item }}" dest: "/etc/postfix/{{ item }}" owner: root group: root - mode: 0600 - force: yes + mode: "0600" + force: true loop: - domains.cf - mailboxes.cf @@ -76,7 +82,7 @@ - sender_canonical_maps.cf - recipient_canonical_maps.cf -- name: restart postfix - systemd: +- name: Restart postfix + ansible.builtin.systemd: name: postfix state: restarted diff --git a/mail_system/tasks/remove_other_mtas.yml b/mail_system/tasks/remove_other_mtas.yml index 37fcfaa..84ba598 100644 --- a/mail_system/tasks/remove_other_mtas.yml +++ b/mail_system/tasks/remove_other_mtas.yml @@ -1,10 +1,13 @@ -- name: find all installed versions of mail-transport-agent except postfix - shell: aptitude search '~i~Pmail-transport-agent' | sed -e 's/^...\(.*\)/\1/' | awk '{ print $1 }' | grep -v postfix || /bin/true +- name: Find all installed versions of mail-transport-agent except postfix + ansible.builtin.shell: + cmd: set -o pipefail && aptitude search '~i~Pmail-transport-agent' | sed -e 's/^...\(.*\)/\1/' | awk '{ print $1 }' | grep -v postfix || /bin/true + executable: /bin/bash register: mtas + changed_when: false -- name: purge MTAs other than postfix - apt: +- name: Purge MTAs other than postfix + ansible.builtin.apt: name: "{{ item }}" state: absent - purge: yes - loop: "{{ mtas.stdout_lines|list }}" + purge: true + loop: "{{ mtas.stdout_lines | list }}" diff --git a/mail_system/tasks/rspamd.yml b/mail_system/tasks/rspamd.yml index 84e67a5..0c132bf 100644 --- a/mail_system/tasks/rspamd.yml +++ b/mail_system/tasks/rspamd.yml @@ -1,52 +1,52 @@ -- name: apt install rspamd - apt: +- name: Install package rspamd + ansible.builtin.apt: name: rspamd state: present # postfix integration -- name: postfix setting milter_mail_macros - lineinfile: +- name: Postfix setting milter_mail_macros + ansible.builtin.lineinfile: path: /etc/postfix/main.cf regexp: '^milter_mail_macros=' line: 'milter_mail_macros=i {mail_addr} {client_addr} {client_name} {auth_authen}' insertafter: '^# rspamd' -- name: postfix setting milter_protocol - lineinfile: +- name: Postfix setting milter_protocol + ansible.builtin.lineinfile: path: /etc/postfix/main.cf regexp: '^milter_protocol=' line: 'milter_protocol=6' insertafter: '^# rspamd' -- name: postfix setting non_smtpd_milters - lineinfile: +- name: Postfix setting non_smtpd_milters + ansible.builtin.lineinfile: path: /etc/postfix/main.cf regexp: '^non_smtpd_milters=' line: 'non_smtpd_milters=inet:127.0.0.1:11332' insertafter: '^# rspamd' -- name: postfix setting smtpd_milters - lineinfile: +- name: Postfix setting smtpd_milters + ansible.builtin.lineinfile: path: /etc/postfix/main.cf regexp: '^smtpd_milters=' line: 'smtpd_milters=inet:127.0.0.1:11332' insertafter: '^# rspamd' -- name: restart postfix - systemd: +- name: Restart postfix + ansible.builtin.systemd: name: postfix state: restarted # rspamd configuration -- name: rspamd configure extended_spam_headers true - template: +- name: Rspamd configure extended_spam_headers true + ansible.builtin.template: src: "rspamd/{{ item }}" dest: "/etc/rspamd/override.d/{{ item }}" owner: root group: root - mode: 0644 + mode: "0644" loop: - milter_headers.conf - classifier-bayes.conf @@ -54,28 +54,28 @@ # install dkim -- name: mkdir /var/lib/rspamd/dkim - file: +- name: Mkdir /var/lib/rspamd/dkim + ansible.builtin.file: path: /var/lib/rspamd/dkim state: directory owner: _rspamd group: _rspamd - mode: '0755' + mode: "0755" -- name: rspamd config dkim_signing.conf and arc.conf - template: +- name: Rspamd config dkim_signing.conf and arc.conf + ansible.builtin.template: src: "rspamd/{{ item }}" dest: "/etc/rspamd/local.d/{{ item }}" owner: root group: root - mode: 0644 + mode: "0644" loop: - dkim_signing.conf - arc.conf # restart rspamd -- name: restart rspamd - systemd: +- name: Restart rspamd + ansible.builtin.systemd: name: rspamd state: restarted diff --git a/mail_system/templates/dovecot/10-auth.conf b/mail_system/templates/dovecot/10-auth.conf deleted file mode 100644 index 88bb718..0000000 --- a/mail_system/templates/dovecot/10-auth.conf +++ /dev/null @@ -1,131 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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 and PAM 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 = -auth_default_realm = {{ mailserver.dovecot.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 -# 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-static.conf.ext diff --git a/mail_system/templates/dovecot/10-mail.conf b/mail_system/templates/dovecot/10-mail.conf deleted file mode 100644 index 2de8bc6..0000000 --- a/mail_system/templates/dovecot/10-mail.conf +++ /dev/null @@ -1,461 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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 = mbox:~/mail:INBOX=/var/mail/%u -mail_location = maildir:/srv/mailstore/%d/%n/Maildir:LAYOUT=fs - -# 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 = - 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 -#} -namespace shared { - type = shared - separator = / - prefix = shared/%%d/%%n/ - # a) Per-user seen flags. Maildir indexes are shared. (INDEXPVT requires v2.2+) - #location = maildir:%%h/Maildir:INDEXPVT=~/Maildir/shared/%%d/%%n/ - location = maildir:/srv/mailstore/%%d/%%n/Maildir:LAYOUT=fs:INDEXPVT=~/shared/%%d/%%n/ - # b) Per-user seen flags. Maildir indexes are not shared. If users have direct filesystem level access to their mails, this is a safer option: - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u:INDEXPVT=~/Maildir/shared/%%u - subscriptions = no - list = yes - inbox = no -} -namespace roles { - type = shared - separator = / - prefix = roles/ - # a) Per-user seen flags. Maildir indexes are shared. (INDEXPVT requires v2.2+) - #location = maildir:%%h/Maildir:INDEXPVT=~/Maildir/shared/%%d/%%n/ - location = maildir:/srv/mailstore/role_specific/roles/Maildir:LAYOUT=fs:INDEXPVT=~/role_specific/roles/ - # b) Per-user seen flags. Maildir indexes are not shared. If users have direct filesystem level access to their$ - #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u:INDEXPVT=~/Maildir/shared/%%u - subscriptions = no - list = yes - inbox = no -} -namespace virtual { - separator = / - prefix = virtual/ - location = virtual:/srv/mailstore/%d/%n/Maildir_virtual -} -# 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 = -mail_uid = mailstore -mail_gid = mailstore - -# 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 where mails can be temporarily stored. Usually it's used only for -# mails larger than >= 128 kB. It's used by various parts of Dovecot, for -# example LDA/LMTP while delivering large mails or zlib plugin for keeping -# uncompressed mails. -#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 = -mail_plugins = acl quota fts fts_lucene virtual - -## -## 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 = yes - -# Trust mailbox list index to be up-to-date. This reduces disk I/O at the cost -# of potentially returning out-of-date results after e.g. server crashes. -# The results will be automatically fixed once the folders are opened. -#mailbox_list_index_very_dirty_syncs = yes - -# Should INBOX be kept up-to-date in the mailbox list index? By default it's -# not, because most of the mailbox accesses will open INBOX anyway. -#mailbox_list_index_include_inbox = no - -# The minimum number of mails in a mailbox before updates are done to cache -# file. This allows optimizing Dovecot's behavior to do less disk writes at -# the cost of more disk reads. -#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 - -# How many slow mail accesses sorting can perform before it returns failure. -# With IMAP the reply is: NO [LIMIT] Requested sort would have taken too long. -# The untagged SORT reply is still returned, but it's likely not correct. -#mail_sort_max_read_count = 0 - -protocol !indexer-worker { - # If folder vsize calculation requires opening more than this many mails from - # disk (i.e. mail sizes aren't in cache already), return failure and finish - # the calculation via indexer process. Disabled by default. This setting must - # be 0 for indexer-worker processes. - #mail_vsize_bg_after_count = 0 - mail_vsize_bg_after_count = 100 -} - -## -## 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 = 10M - -# 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} - -# Settings to control adding $HasAttachment or $HasNoAttachment keywords. -# By default, all MIME parts with Content-Disposition=attachment, or inlines -# with filename parameter are consired attachments. -# add-flags - Add the keywords when saving new mails or when fetching can -# do it efficiently. -# content-type=type or !type - Include/exclude content type. Excluding will -# never consider the matched MIME part as attachment. Including will only -# negate an exclusion (e.g. content-type=!foo/* content-type=foo/bar). -# exclude-inlined - Exclude any Content-Disposition=inline MIME part. -#mail_attachment_detection_options = diff --git a/mail_system/templates/dovecot/10-master.conf b/mail_system/templates/dovecot/10-master.conf deleted file mode 100644 index befe56d..0000000 --- a/mail_system/templates/dovecot/10-master.conf +++ /dev/null @@ -1,154 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -#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 -# for virtual mailbox 'all' we need more memory -default_vsz_limit = 1G - -# 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 submission-login { - inet_listener submission { - #port = 587 - } -} - -service lmtp { - unix_listener /var/spool/postfix/private/dovecot-lmtp { - group = postfix - mode = 0600 - user = postfix - } -# unix_listener lmtp { -# #mode = 0666 -# } - - # 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 submission { - # Max. number of SMTP Submission 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 = 0666 - #} - 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 = mailstore - group = mailstore - } -} - -service quota-status { - executable = quota-status -p postfix - inet_listener { - port = 12480 - # You can choose any port you want - } - client_limit = 1 -} diff --git a/mail_system/templates/dovecot/10-ssl.conf b/mail_system/templates/dovecot/10-ssl.conf deleted file mode 100644 index 0838ef5..0000000 --- a/mail_system/templates/dovecot/10-ssl.conf +++ /dev/null @@ -1,84 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## SSL settings -## - -# SSL/TLS support: yes, no, required. -ssl = yes - -# 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 = ) instead of full path -# syntax. -# -# The list is space-separated. -#lmtp_client_workarounds = - -protocol lmtp { - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - mail_plugins = $mail_plugins sieve -} diff --git a/mail_system/templates/dovecot/90-acl.conf b/mail_system/templates/dovecot/90-acl.conf deleted file mode 100644 index bb8f369..0000000 --- a/mail_system/templates/dovecot/90-acl.conf +++ /dev/null @@ -1,24 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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 - acl = vfile -} - -# 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 - acl_shared_dict = proxy::acl -} diff --git a/mail_system/templates/dovecot/90-plugin.conf b/mail_system/templates/dovecot/90-plugin.conf deleted file mode 100644 index b493bc2..0000000 --- a/mail_system/templates/dovecot/90-plugin.conf +++ /dev/null @@ -1,18 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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 { - fts = lucene - fts_lucene = whitespace_chars=@. - fts_autoindex=yes - fts_autoindex_exclude = \Junk - fts_autoindex_exclude2 = \Trash -} diff --git a/mail_system/templates/dovecot/90-quota.conf b/mail_system/templates/dovecot/90-quota.conf deleted file mode 100644 index 5e80818..0000000 --- a/mail_system/templates/dovecot/90-quota.conf +++ /dev/null @@ -1,107 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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 plugin can also limit the maximum accepted mail size. - #quota_max_mail_size = 100M -} - -## -## 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 -} - -plugin { - # https://wiki2.dovecot.org/Quota - quota_grace = 10%% - quota_status_success = DUNNO - quota_status_nouser = DUNNO - quota_status_overquota = "552 5.2.2 Mailbox is full" - quota_exceeded_message = Quota exceeded, please reduce your overall mail volume and/or the number of messages in your inbox. - - # https://wiki2.dovecot.org/Quota/Configuration - # https://wiki2.dovecot.org/Quota/Count - quota = count:User quota - quota_rule = *:storage={{ mailserver.dovecot.mailbox_max_bytes | default(100000000000) }} - # ATTENTION: the following rule counts all messages in the mailbox, not just in the inbox - quota_rule2 = INBOX:messages=+{{ mailserver.dovecot.mailbox_max_messages | default(500000) }} - quota_rule3 = Trash:storage=+200M - - # https://wiki2.dovecot.org/Quota/Count - # This is required - it uses "virtual sizes" rather than "physical sizes" for quota counting: - quota_vsizes = yes -} diff --git a/mail_system/templates/dovecot/90-sieve-extprograms.conf b/mail_system/templates/dovecot/90-sieve-extprograms.conf deleted file mode 100644 index 8f8d496..0000000 --- a/mail_system/templates/dovecot/90-sieve-extprograms.conf +++ /dev/null @@ -1,49 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -# Sieve Extprograms plugin configuration - -# Don't forget to add the sieve_extprograms plugin to the sieve_plugins setting. -# Also enable the extensions you need (one or more of vnd.dovecot.pipe, -# vnd.dovecot.filter and vnd.dovecot.execute) by adding these to the -# sieve_extensions or sieve_global_extensions settings. Restricting these -# extensions to a global context using sieve_global_extensions is recommended. - -plugin { - - # The directory where the program sockets are located for the - # vnd.dovecot.pipe, vnd.dovecot.filter and vnd.dovecot.execute extension - # respectively. The name of each unix socket contained in that directory - # directly maps to a program-name referenced from the Sieve script. - #sieve_pipe_socket_dir = sieve-pipe - #sieve_filter_socket_dir = sieve-filter - #sieve_execute_socket_dir = sieve-execute - - # The directory where the scripts are located for direct execution by the - # vnd.dovecot.pipe, vnd.dovecot.filter and vnd.dovecot.execute extension - # respectively. The name of each script contained in that directory - # directly maps to a program-name referenced from the Sieve script. - #sieve_pipe_bin_dir = /usr/lib/dovecot/sieve-pipe - #sieve_filter_bin_dir = /usr/lib/dovecot/sieve-filter - #sieve_execute_bin_dir = /usr/lib/dovecot/sieve-execute - sieve_pipe_bin_dir = /etc/dovecot/sieve_pipes - sieve_filter_bin_dir = /etc/dovecot/sieve_filters - sieve_execute_bin_dir = /etc/dovecot/sieve_execute -} - -# An example program service called 'do-something' to pipe messages to -#service do-something { - # Define the executed script as parameter to the sieve service - #executable = script /usr/lib/dovecot/sieve-pipe/do-something.sh - - # Use some unprivileged user for executing the program - #user = dovenull - - # The unix socket located in the sieve_pipe_socket_dir (as defined in the - # plugin {} section above) - #unix_listener sieve-pipe/do-something { - # LDA/LMTP must have access - # user = vmail - # mode = 0600 - #} -#} diff --git a/mail_system/templates/dovecot/90-sieve.conf b/mail_system/templates/dovecot/90-sieve.conf deleted file mode 100644 index 8f8ca8e..0000000 --- a/mail_system/templates/dovecot/90-sieve.conf +++ /dev/null @@ -1,234 +0,0 @@ -# THIS FILE IS CONTROLLED BY ANSIBLE - DO NOT CHANGE IN DEPLOYMENT! - - -## -## 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. - -# The Sieve interpreter can retrieve Sieve scripts from several types of -# locations. The default `file' location type is a local filesystem path -# pointing to a Sieve script file or a directory containing multiple Sieve -# script files. More complex setups can use other location types such as -# `ldap' or `dict' to fetch Sieve scripts from remote databases. -# -# All settings that specify the location of one ore more Sieve scripts accept -# the following syntax: -# -# location = [:]path[;