From f056b30b0cf56be9c6d8d909678d5c256e400f30 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Thu, 25 Jul 2024 14:09:33 -0500
Subject: [PATCH] fix(bugs): fix smtp haproxy config, allow smtp through lb
 firewall

---
 pillar/base/firewall/loadbalancer.sls | 3 +++
 pillar/base/haproxy.sls               | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pillar/base/firewall/loadbalancer.sls b/pillar/base/firewall/loadbalancer.sls
index 6e743c05..dc41a4c6 100644
--- a/pillar/base/firewall/loadbalancer.sls
+++ b/pillar/base/firewall/loadbalancer.sls
@@ -34,3 +34,6 @@ firewall:
 
   "buildbot.python.org:worker":
     port: 9020
+
+  "bugs.python.org:smtp":
+    port: 20025
diff --git a/pillar/base/haproxy.sls b/pillar/base/haproxy.sls
index 1ca1b26a..2ba4c383 100644
--- a/pillar/base/haproxy.sls
+++ b/pillar/base/haproxy.sls
@@ -167,7 +167,7 @@ haproxy:
         - timeout server 86400
 
     {# We can extend this for smtps/submission later #}
-    {% for (port, service, ssl) in [(25, "smtp", False)] %}
+    {% for (port, service, ssl) in [(20025, "smtp", False)] %}
     roundup-{{ service }}:
       bind: :{{ port }} {% if ssl %} ssl crt /etc/ssl/private/bugs.python.org.pem {% endif %}
       service: roundup-{{ service }}