From 5593f9530fd49bff4b9d70b8847dd14aa5b4e5e9 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Wed, 17 Jul 2024 02:04:54 -0700
Subject: [PATCH] fix mail

---
 playbooks/roles/mail/tasks/main.yml                  | 12 ++++++++++++
 playbooks/roles/mail/templates/docker-compose.yml.j2 |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/playbooks/roles/mail/tasks/main.yml b/playbooks/roles/mail/tasks/main.yml
index 81ced1d..822357a 100644
--- a/playbooks/roles/mail/tasks/main.yml
+++ b/playbooks/roles/mail/tasks/main.yml
@@ -78,3 +78,15 @@
     state: restarted
     enabled: true
     name: docker-compose@mail
+
+- name: Allow SMTP
+  ansible.builtin.ufw:
+    rule: allow
+    port: "465"
+    proto: "tcp"
+
+- name: Allow IMAP
+  ansible.builtin.ufw:
+    rule: allow
+    port: "993"
+    proto: "tcp"
diff --git a/playbooks/roles/mail/templates/docker-compose.yml.j2 b/playbooks/roles/mail/templates/docker-compose.yml.j2
index 7f61336..ac33cc2 100644
--- a/playbooks/roles/mail/templates/docker-compose.yml.j2
+++ b/playbooks/roles/mail/templates/docker-compose.yml.j2
@@ -22,6 +22,8 @@ services:
       - ROUNDCUBEMAIL_DEFAULT_PORT={{ roundcube_default_port }}
       - ROUNDCUBEMAIL_SMTP_SERVER={{ roundcube_smtp_host }}
       - ROUNDCUBEMAIL_SMTP_PORT={{ roundcube_smtp_port }}
+    networks:
+      - roundcube
 
   mailserver:
     image: ghcr.io/docker-mailserver/docker-mailserver:latest
@@ -80,3 +82,9 @@ services:
       - PERMIT_DOCKER=host #fix SPF fail by copying the IPv4 of the docker container into the postfix cfg
     extra_hosts:
       - {{ ldap_server }}:{{ ldap_intranet }}
+    networks:
+      - mailserver
+
+networks:
+  mailserver:
+  roundcube: