From: Grant Slater <git@firefishy.com>
Date: Thu, 10 Mar 2022 13:51:22 +0000 (+0000)
Subject: Use dedicated port for discourse mail-receiver service
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/11618b6cc7af9c1f116f96ec5eeb8973e101f7c4?hp=57c5ea6ebb45d272072a6525e2fa13b816df54f9

Use dedicated port for discourse mail-receiver service
---

diff --git a/cookbooks/community/templates/default/mail-receiver.yml.erb b/cookbooks/community/templates/default/mail-receiver.yml.erb
index 91b21cef1..4460d30f9 100644
--- a/cookbooks/community/templates/default/mail-receiver.yml.erb
+++ b/cookbooks/community/templates/default/mail-receiver.yml.erb
@@ -11,7 +11,7 @@ base_image: discourse/mail-receiver:release
 update_pups: false
 
 expose:
-  - "25:25"   # SMTP
+  - "2500:25"   # SMTP
 
 env:
   LC_ALL: en_US.UTF-8
diff --git a/roles/mail.rb b/roles/mail.rb
index bb64e0814..c2de47e92 100644
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -50,7 +50,7 @@ default_attributes(
       :discourse => {
         :comment => "community.osmfoundation.org",
         :domains => ["community.osmfoundation.org"],
-        :host => "lockheed.ams.openstreetmap.org"
+        :host => "lockheed.ams.openstreetmap.org::2500"
       }
     },
     :dkim_selectors => {