From ce4c85dd6f99506128bb125e26728a7416660397 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Sun, 7 Jan 2024 02:38:42 -0500
Subject: make dmarc more aggressive, fix unresolved mail addresses

---
 roles/mail/files/postmaster-main.cf |  3 +++
 roles/mail/tasks/main.yml           | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 roles/mail/files/postmaster-main.cf

(limited to 'roles/mail')

diff --git a/roles/mail/files/postmaster-main.cf b/roles/mail/files/postmaster-main.cf
new file mode 100644
index 0000000..1bfb761
--- /dev/null
+++ b/roles/mail/files/postmaster-main.cf
@@ -0,0 +1,3 @@
+virtual_mailbox_domains = /etc/postfix/vhost
+virtual_mailbox_maps = ldap:/etc/postfix/ldap-users.cf
+virtual_alias_maps =
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 4233f68..cef06f5 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -42,6 +42,20 @@
     group: root
     mode: 0700
 
+- name: ensure mail docker/compose volume exist
+  file:
+    path: /etc/docker/compose/mail/docker-data/dms/config
+    state: directory
+    owner: root
+    group: root
+    mode: 0700
+
+# https://github.com/docker-mailserver/docker-mailserver/issues/1562
+- name: ensure mail docker/compose ldap overrides exist
+  copy:
+    src: ../files/postmaster-main.cf
+    dest: /etc/docker/compose/mail/docker-data/dms/config/postfix-main.cf
+
 - name: build mail docker-compose.yml.j2
   template:
     src: ../templates/docker-compose.yml.j2
-- 
cgit v1.2.3-70-g09d2