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 91b21cef1008ccfa704d850f962b7d9525bfc93b..4460d30f9b4fa27abd73b21008816f050dcf1dec 100644 (file)
--- 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 bb64e08145cdc862adc85083c87392134171b459..c2de47e92b0e9c3bc39049100324e2a766e7e023 100644 (file)
--- 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 => {