From dcadf88adaac52530e3638235437438832e7467f Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Wed, 20 May 2020 08:37:09 +0200
Subject: [PATCH] mail: cleanup

---
 roles/mail/files/rspamd/local.d/antivirus.conf | 2 +-
 roles/mail/handlers/main.yml                   | 1 -
 roles/mail/tasks/main.yml                      | 2 +-
 roles/mail/templates/dovecot/local.conf.j2     | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/roles/mail/files/rspamd/local.d/antivirus.conf b/roles/mail/files/rspamd/local.d/antivirus.conf
index db0a12a..4887397 100644
--- a/roles/mail/files/rspamd/local.d/antivirus.conf
+++ b/roles/mail/files/rspamd/local.d/antivirus.conf
@@ -3,7 +3,7 @@ clamav {
     symbol = "CLAMAV_VIRUS";
     attachments_only = false;
     patterns {
-	JUST_EICAR = nan; #Disable EICAR handling
+        JUST_EICAR = nan; #Disable EICAR handling
     }
     action = "reject";
 }
diff --git a/roles/mail/handlers/main.yml b/roles/mail/handlers/main.yml
index 83a66b3..e289c09 100644
--- a/roles/mail/handlers/main.yml
+++ b/roles/mail/handlers/main.yml
@@ -24,6 +24,5 @@
   command: postmap /etc/{{ item }}
   with_items:
   - postfix/helo_access
-  - postfix/recipient_access
   - postfix/transport
   - postfix/virtual-alias
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 3e33034..a7180d0 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -20,10 +20,10 @@
   - mailman
   - mailman3
   - postfix
+  - postsrsd
   - redis-server
   - redis-tools
   - rspamd
-  - postsrsd
 
 - name: Create vmail group
   group: name=vmail gid=500 state=present
diff --git a/roles/mail/templates/dovecot/local.conf.j2 b/roles/mail/templates/dovecot/local.conf.j2
index 31e1872..515f7e9 100644
--- a/roles/mail/templates/dovecot/local.conf.j2
+++ b/roles/mail/templates/dovecot/local.conf.j2
@@ -11,13 +11,12 @@ info_log_path = /var/log/dovecot/info.log
 mail_privileged_group = mail
 mail_location = maildir:~/.maildir
 
-postmaster_address = postmaster@binary-kitchen.de
+postmaster_address = postmaster@{{ mail_domain }}
 submission_host = 127.0.0.1:10025
 
 ssl = yes
 ssl_cert = </etc/dovecot/ssl/{{ mail_server }}.crt
 ssl_key = </etc/dovecot/ssl/{{ mail_server }}.key
-ssl_protocols = !SSLv3
 ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
 
 service lmtp {