community: use faffy for mail relay

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index d421f1081259d5100920a4f20cbab424dcecf9d4..a4ff342116db33ef3df84a0f08986f12ff3c2afe 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -21,7 +21,7 @@ links:
 
 # Workaround bug: https://github.com/discourse/discourse_docker/pull/505
 # params:
-#  version: v2.8.11
+#  version: v2.8.11 - NOT USED HERE. UPDATE THE EXEC GIT ACTIONS BELOW WITH VERSION
 
 env:
   LC_ALL: en_US.UTF-8
@@ -45,14 +45,10 @@ env:
   ## on initial signup example 'user1@example.com,user2@example.com'
   DISCOURSE_DEVELOPER_EMAILS: 'operations@openstreetmap.org'
 
-  ## TODO: The SMTP mail server used to validate new accounts and send notifications
-  # SMTP ADDRESS, username, and password are required
-  # WARNING the char '#' in SMTP password can cause problems!
-  DISCOURSE_SMTP_ADDRESS: mail.openstreetmap.org
-  DISCOURSE_SMTP_PORT: 26
+  DISCOURSE_SMTP_ADDRESS: <%= node[:exim][:smarthost_via].split(":", 2)[0] %>
+  DISCOURSE_SMTP_PORT: <%= node[:exim][:smarthost_via].split(":", 2)[1] || "25" %>
   DISCOURSE_SMTP_USER_NAME:
   DISCOURSE_SMTP_PASSWORD:
-  # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
   DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 

diff --git a/roles/community.rb b/roles/community.rb
index c24e40fbbe80ac01902647787d8a33e187ffd393..b482cfce0ebc3297b7aaf0339c01c4c986866153 100644 (file)
--- a/roles/community.rb
+++ b/roles/community.rb
@@ -9,6 +9,9 @@ default_attributes(
         :members => [:grant, :tomh]
       }
     }
+  },
+  :exim => {
+    :smarthost_via => "fafnir.openstreetmap.org:26"
   }
 )
 

diff --git a/roles/dev.rb b/roles/dev.rb
index 108d2ed1755104af771cc719d9fbea7d9dea4498..18e0edfcf279fbf63a1f05f4b87f464bb050ec19 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -127,7 +127,7 @@ default_attributes(
     }
   },
   :exim => {
-      :smarthost_via => "fafnir.openstreetmap.org:26"
+    :smarthost_via => "fafnir.openstreetmap.org:26"
   },
   :postgresql => {
     :versions => ["14"],