From 1a1b7c7d9303f5ebadc8e71dad3c82f3bea2bb24 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <me@liz.coffee>
Date: Sun, 20 Apr 2025 14:13:00 -0700
Subject: Fix umask

---
 playbooks/roles/mail/templates/stacks/docker-compose.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'playbooks/roles/mail/templates/stacks')

diff --git a/playbooks/roles/mail/templates/stacks/docker-compose.yml b/playbooks/roles/mail/templates/stacks/docker-compose.yml
index 654f264..bdba6ac 100644
--- a/playbooks/roles/mail/templates/stacks/docker-compose.yml
+++ b/playbooks/roles/mail/templates/stacks/docker-compose.yml
@@ -59,12 +59,24 @@ services:
         - traefik.tcp.routers.imap.entrypoints=imap
         - traefik.tcp.routers.imap.service=imap
         - traefik.tcp.services.imap.loadbalancer.server.port=993
-        # SMTP
+        # SMTPS
+        - traefik.tcp.routers.smtps.tls.passthrough=true
+        - traefik.tcp.routers.smtps.rule=HostSNI(`*`)
+        - traefik.tcp.routers.smtps.entrypoints=smtp
+        - traefik.tcp.routers.smtps.service=smtp
+        - traefik.tcp.services.smtps.loadbalancer.server.port=465
+        # SMTP (StartTLS)
+        - traefik.tcp.routers.smtptls.tls.passthrough=true
+        - traefik.tcp.routers.smtptls.rule=HostSNI(`*`)
+        - traefik.tcp.routers.smtptls.entrypoints=smtptls
+        - traefik.tcp.routers.smtptls.service=smtptls
+        - traefik.tcp.services.smtptls.loadbalancer.server.port=587
+        # SMTP ("ye' old")
         - traefik.tcp.routers.smtp.tls.passthrough=true
         - traefik.tcp.routers.smtp.rule=HostSNI(`*`)
         - traefik.tcp.routers.smtp.entrypoints=smtp
         - traefik.tcp.routers.smtp.service=smtp
-        - traefik.tcp.services.smtp.loadbalancer.server.port=465
+        - traefik.tcp.services.smtp.loadbalancer.server.port=25
     volumes:
       - {{ mail_base }}/volumes/data/dms/vmail:/var/mail/
       - {{ mail_base }}/volumes/data/dms/mail-state:/var/mail-state/
-- 
cgit v1.2.3-70-g09d2