From 5427dfba54953c953cfc09809858e5b2a8980f16 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sun, 4 Jul 2021 00:51:22 +0200
Subject: [PATCH] lmtp

---
 roles/mailman/templates/main.cf.j2      | 2 ++
 roles/mailman3/tasks/main.yml           | 6 ++++++
 roles/mailman3/templates/mailman.cfg.j2 | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/roles/mailman/templates/main.cf.j2 b/roles/mailman/templates/main.cf.j2
index 91101977c..a23cc0134 100644
--- a/roles/mailman/templates/main.cf.j2
+++ b/roles/mailman/templates/main.cf.j2
@@ -49,6 +49,8 @@ non_smtpd_milters = $smtpd_milters
 alias_maps = hash:/var/lib/mailman/data/aliases
 alias_database = $alias_maps
 virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman
+local_recipient_maps = proxy:unix:passwd.byname $alias_maps hash:/etc/postfix/transport
+transport_maps = hash:/etc/postfix/transport
 
 milter_header_checks = pcre:/etc/postfix/milter_header_checks
 
diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml
index 84761090c..29e547e24 100644
--- a/roles/mailman3/tasks/main.yml
+++ b/roles/mailman3/tasks/main.yml
@@ -43,6 +43,12 @@
   become_user: postgres
   become_method: su
 
+- name: open firewall holes for mailman (LMTP)
+  ansible.posix.firewalld: port=8024/tcp zone=wireguard permanent=true state=enabled immediate=yes
+  when: configure_firewall
+  tags:
+    - firewall
+
 # TODO: start uwsgi
 # TODO: hyperkittynginx.ini
 # TODO: hyperkitty databases
diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2
index 1f3cfa9d6..128350ec6 100644
--- a/roles/mailman3/templates/mailman.cfg.j2
+++ b/roles/mailman3/templates/mailman.cfg.j2
@@ -11,5 +11,7 @@ admin_pass: {{ vault_mailman_admin_pass }}
 
 [mta]
 configuration: /etc/postfix.cfg
+lmtp_host: {{ hostvars['mailman3.archlinux.org']['wireguard_address'] }}
+lmtp_port: 8024
 smtp_host: {{ hostvars['lists.archlinux.org']['wireguard_address'] }}
 smtp_port: 25
-- 
GitLab