From 9e6ac44928555ecaf2bb83334747b5e3773745d1 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Sun, 20 Oct 2024 18:49:16 +0100
Subject: [PATCH] Add more mail-related ports

---
 servers/containers/traefik.container | 34 ++++++++++++++++++++++++----
 servers/traefik/config.yml           | 24 ++++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/servers/containers/traefik.container b/servers/containers/traefik.container
index 75e63b93..73085518 100644
--- a/servers/containers/traefik.container
+++ b/servers/containers/traefik.container
@@ -40,6 +40,25 @@ PublishPort=0.0.0.0:25:25/tcp
 PublishPort=[::]:25:25/tcp
 # PublishPort=[::]:25:25/udp
 
+# POP
+PublishPort=0.0.0.0:110:110/tcp
+# PublishPort=0.0.0.0:110:110/udp
+PublishPort=[::]:110:110/tcp
+# PublishPort=[::]:110:110/udp
+
+# ManageSieve
+PublishPort=0.0.0.0:4190:4190/tcp
+# PublishPort=0.0.0.0:4190:4190/udp
+PublishPort=[::]:4190:4190/tcp
+# PublishPort=[::]:4190:4190/udp
+
+
+# SMTP submission over STARTTLS
+PublishPort=0.0.0.0:587:587/tcp
+# PublishPort=0.0.0.0:587:587/udp
+PublishPort=[::]:587:587/tcp
+# PublishPort=[::]:587:587/udp
+
 # SMTPS
 PublishPort=0.0.0.0:465:465/tcp
 # PublishPort=0.0.0.0:465:465/udp
@@ -47,10 +66,17 @@ PublishPort=[::]:465:465/tcp
 # PublishPort=[::]:465:465/udp
 
 # IMAPS
-PublishPort=0.0.0.0:465:465/tcp
-# PublishPort=0.0.0.0:465:465/udp
-PublishPort=[::]:465:465/tcp
-# PublishPort=[::]:465:465/udp
+PublishPort=0.0.0.0:993:993/tcp
+# PublishPort=0.0.0.0:993:993/udp
+PublishPort=[::]:993:993/tcp
+# PublishPort=[::]:993:993/udp
+
+# POPS
+PublishPort=0.0.0.0:995:995/tcp
+# PublishPort=0.0.0.0:995:995/udp
+PublishPort=[::]:995:995/tcp
+# PublishPort=[::]:995:995/udp
+
 
 ReadOnly=true
 Volume=/run/podman/podman.sock:/var/run/docker.sock:z
diff --git a/servers/traefik/config.yml b/servers/traefik/config.yml
index 39f39922..396164cf 100644
--- a/servers/traefik/config.yml
+++ b/servers/traefik/config.yml
@@ -50,6 +50,24 @@ entrypoints:
       trustedIPs: # Trust IPs from inside the "web" network
         - 10.89.0.0/24
         - fd76:6f6d:f45e:ea1a::/64
+  pop:
+    address: :110
+    proxyProtocol:
+      trustedIPs:
+        - 10.89.0.0/24
+        - fd76:6f6d:f45e:ea1a::/64
+  managesieve:
+    address: :4190
+    proxyProtocol:
+      trustedIPs:
+        - 10.89.0.0/24
+        - fd76:6f6d:f45e:ea1a::/64
+  smtpstarttls:
+    address: :587
+    proxyProtocol:
+      trustedIPs:
+        - 10.89.0.0/24
+        - fd76:6f6d:f45e:ea1a::/64
   smtps:
     address: :465
     proxyProtocol:
@@ -62,6 +80,12 @@ entrypoints:
       trustedIPs:
         - 10.89.0.0/24
         - fd76:6f6d:f45e:ea1a::/64
+  pops:
+    address: :995
+    proxyProtocol:
+      trustedIPs:
+        - 10.89.0.0/24
+        - fd76:6f6d:f45e:ea1a::/64
 http:
   middlewares:
     traefik-compress: