From 1217509ea6e3d35e1698fc5970acb8b5e5aab30b Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Tue, 1 Jul 2025 11:50:01 -0400
Subject: [PATCH] email_server: Open port 25 and document
 EMAIL_GATEWAY_PATTERN.

---
 Dockerfile                                        | 2 +-
 docker-compose.yml                                | 5 +++++
 kubernetes/chart/zulip/templates/statefulset.yaml | 3 +++
 kubernetes/manual/zulip-rc.yml                    | 3 +++
 kubernetes/manual/zulip-svc.yml                   | 4 ++++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7607f64a4b..b779244b97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ COPY entrypoint.sh /sbin/entrypoint.sh
 COPY certbot-deploy-hook /sbin/certbot-deploy-hook
 
 VOLUME ["$DATA_DIR"]
-EXPOSE 80 443
+EXPOSE 25 80 443
 
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 CMD ["app:run"]
diff --git a/docker-compose.yml b/docker-compose.yml
index abef4ce166..fa50b8ab27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,6 +59,7 @@ services:
         ## Set this up if you plan to use your own CA certificate bundle for building
         # CUSTOM_CA_CERTIFICATES:
     ports:
+      - "25:25"
       - "80:80"
       - "443:443"
     environment:
@@ -88,6 +89,10 @@ services:
       ## It seems that the email server needs to use ssl or tls and can't be used without it
       SETTING_EMAIL_USE_SSL: "False"
       SETTING_EMAIL_USE_TLS: "True"
+      ## Uncomment to enable the incoming email gateway.  You will need to
+      ## ensure that email to emaildomain.example.com is routed to this host
+      ## (e.g. via MX record)
+      # SETTING_EMAIL_GATEWAY_PATTERN: "%s@emaildomain.example.com"
       ZULIP_AUTH_BACKENDS: "EmailAuthBackend"
       ## Uncomment this when configuring the mobile push notifications service
       # SETTING_ZULIP_SERVICE_PUSH_NOTIFICATIONS: "True"
diff --git a/kubernetes/chart/zulip/templates/statefulset.yaml b/kubernetes/chart/zulip/templates/statefulset.yaml
index 952d725f48..d9f5bbc1b6 100644
--- a/kubernetes/chart/zulip/templates/statefulset.yaml
+++ b/kubernetes/chart/zulip/templates/statefulset.yaml
@@ -47,6 +47,9 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
+            - name: smtp
+              containerPort: 25
+              protocol: TCP
             - name: http
               containerPort: 80
               protocol: TCP
diff --git a/kubernetes/manual/zulip-rc.yml b/kubernetes/manual/zulip-rc.yml
index 03b3f2377f..49f47aa117 100644
--- a/kubernetes/manual/zulip-rc.yml
+++ b/kubernetes/manual/zulip-rc.yml
@@ -137,6 +137,9 @@ spec:
           # - name: SETTING_PUSH_NOTIFICATION_BOUNCER_URL
           #   value: 'https://push.zulipchat.com'
           ports:
+            - containerPort: 25
+              name: smtp
+              protocol: TCP
             - containerPort: 80
               name: http
               protocol: TCP
diff --git a/kubernetes/manual/zulip-svc.yml b/kubernetes/manual/zulip-svc.yml
index 65429645a0..2f07282758 100644
--- a/kubernetes/manual/zulip-svc.yml
+++ b/kubernetes/manual/zulip-svc.yml
@@ -8,6 +8,10 @@ spec:
   selector:
     app: zulip
   ports:
+  - name: smtp
+    port: 25
+    targetPort: 25
+    protocol: TCP
   - name: http
     port: 80
     targetPort: 80