From fe40ec4e2f6c995ed050d8916b2d829091b8df1e Mon Sep 17 00:00:00 2001
From: Aeris <a3x@eris.cc>
Date: Wed, 28 Nov 2018 15:21:35 +0100
Subject: [PATCH] mailman-web wants smtp too

---
 deploy/roles/mailserver/files/smtp/main.cf              | 2 +-
 deploy/roles/mailserver/templates/docker-compose.yml.j2 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/deploy/roles/mailserver/files/smtp/main.cf b/deploy/roles/mailserver/files/smtp/main.cf
index 27a4455..2d7368f 100644
--- a/deploy/roles/mailserver/files/smtp/main.cf
+++ b/deploy/roles/mailserver/files/smtp/main.cf
@@ -65,7 +65,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 mydestination = localhost
 relayhost =
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 172.16.0.0/12
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 172.0.0.0/8
 mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = all
diff --git a/deploy/roles/mailserver/templates/docker-compose.yml.j2 b/deploy/roles/mailserver/templates/docker-compose.yml.j2
index eeb9108..3d6b522 100644
--- a/deploy/roles/mailserver/templates/docker-compose.yml.j2
+++ b/deploy/roles/mailserver/templates/docker-compose.yml.j2
@@ -176,6 +176,7 @@ services:
     links:
       - mailman-core:mailman-core
       - db:db
+      - smtp:smtp
     volumes:
       - {{ docker_data_folder }}/mailserver/mailman/web:/opt/mailman-web-data
     environment:
@@ -188,6 +189,8 @@ services:
       - DJANGO_ALLOWED_HOSTS=mailman.{{ DOMAIN }}
       - MAILMAN_ADMIN_USER=admin
       - MAILMAN_ADMIN_EMAIL=a3x@eris.cc
+      - SMTP_PORT=587
+      - SMTP_HOST=smtp
       - UWSGI_STATIC_MAP=/static=/opt/mailman-web-data/static
     labels:
       #- "traefik.frontend.rule=Host:mailman.{{ DOMAIN }}"