Added variables for SMTP (#8591)

Okay I'm going to merge and hope that it will work in staging.
publiclab · Dec 7, 2020 · 8276e02 · 8276e02
1 parent cbb807b
commit 8276e02
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -67,8 +67,12 @@
   config.action_mailer.delivery_method = :smtp
 
   config.action_mailer.smtp_settings = {
-  :address => "smtp",
-  :port => 25,
+  :address => ENV["SMTP_HOST"] || "smtp",
+  :port => ENV["SMTP_PORT"] || 25,
+  :user_name => ENV["SMTP_USER"] || '',
+  :password => ENV["SMTP_PASS"] || '',
+  :authentication => ENV["SMTP_AUTH"] || '',
+  :enable_starttls_auto =>  ENV["SMTP_STLS"] || false }
   }
 
   # Enable threaded mode

diff --git a/containers/docker-compose-production.yml b/containers/docker-compose-production.yml
@@ -32,6 +32,12 @@ services:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - USERNAME=${USERNAME}
       - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
       - OAUTH_GOOGLE_APP_KEY=${OAUTH_GOOGLE_APP_KEY}
       - OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
       - OAUTH_GITHUB_APP_KEY=${OAUTH_GITHUB_APP_KEY}

diff --git a/containers/docker-compose-stable.yml b/containers/docker-compose-stable.yml
@@ -32,6 +32,12 @@ services:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - USERNAME=${USERNAME}
       - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
       - OAUTH_GOOGLE_APP_KEY=${OAUTH_GOOGLE_APP_KEY}
       - OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
       - OAUTH_GITHUB_APP_KEY=${OAUTH_GITHUB_APP_KEY}

diff --git a/containers/docker-compose-unstable.yml b/containers/docker-compose-unstable.yml
@@ -32,6 +32,12 @@ services:
       - SERVER_ADDRESS=${SERVER_ADDRESS}
       - USERNAME=${USERNAME}
       - EMAIL_PASSWORD=${EMAIL_PASSWORD}
+      - SMTP_USER=${SMTP_USER}
+      - SMTP_PASS=${SMTP_PASS}
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_AUTH=${SMTP_AUTH}
+      - SMTP_STLS=${SMTP_STLS}
       - OAUTH_GOOGLE_APP_KEY=${OAUTH_GOOGLE_APP_KEY}
       - OAUTH_GOOGLE_APP_SECRET=${OAUTH_GOOGLE_APP_SECRET}
       - OAUTH_GITHUB_APP_KEY=${OAUTH_GITHUB_APP_KEY}