Update app configuration SMTP settings

harvard-library · Dec 10, 2020 · 82aeed0 · 82aeed0
1 parent 262cd14
commit 82aeed0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -48,12 +48,15 @@
     address:              ENV['SMTP_ADDRESS'],
     port:                 ENV['SMTP_PORT'],
     domain:               ENV['SMTP_DOMAIN'],
-    username:             ENV['SMTP_USERNAME']||'',
-    password:             ENV['SMTP_PASSWORD']||'',
     authentication:       ENV['SMTP_AUTHENTICATION']||:plain,
     enable_starttls_auto: ENV['SMTP_TLS']||false
   }
 
+  if ENV["SMTP_USERNAME"].present? && ENV["SMTP_PASSWORD"].present?
+    config.action_mailer.smtp_settings.username = ENV['SMTP_USERNAME']
+    config.action_mailer.smtp_settings.password = ENV['SMTP_PASSWORD']
+  end
+
   MAIL_RECIPIENT_OVERRIDE = (ENV['OVERRIDE_RECIPIENTS']||[]).split(",")
   config.action_mailer.perform_caching = false
 

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -44,12 +44,15 @@
     address:              ENV['SMTP_ADDRESS'],
     port:                 ENV['SMTP_PORT'],
     domain:               ENV['SMTP_DOMAIN'],
-    username:             ENV['SMTP_USERNAME']||'',
-    password:             ENV['SMTP_PASSWORD']||'',
     authentication:       ENV['SMTP_AUTHENTICATION']||:plain,
     enable_starttls_auto: ENV['SMTP_TLS']||false
   }
 
+  if ENV["SMTP_USERNAME"].present? && ENV["SMTP_PASSWORD"].present?
+    config.action_mailer.smtp_settings.username = ENV['SMTP_USERNAME']
+    config.action_mailer.smtp_settings.password = ENV['SMTP_PASSWORD']
+  end
+
   MAIL_RECIPIENT_OVERRIDE = (ENV['OVERRIDE_RECIPIENTS']||[]).split(",")
   config.action_mailer.perform_caching = false
 

diff --git a/config/environments/qa.rb b/config/environments/qa.rb
@@ -44,12 +44,15 @@
     address:              ENV['SMTP_ADDRESS'],
     port:                 ENV['SMTP_PORT'],
     domain:               ENV['SMTP_DOMAIN'],
-    username:             ENV['SMTP_USERNAME']||'',
-    password:             ENV['SMTP_PASSWORD']||'',
     authentication:       ENV['SMTP_AUTHENTICATION']||:plain,
     enable_starttls_auto: ENV['SMTP_TLS']||false
   }
 
+  if ENV["SMTP_USERNAME"].present? && ENV["SMTP_PASSWORD"].present?
+    config.action_mailer.smtp_settings.username = ENV['SMTP_USERNAME']
+    config.action_mailer.smtp_settings.password = ENV['SMTP_PASSWORD']
+  end
+
   MAIL_RECIPIENT_OVERRIDE = (ENV['OVERRIDE_RECIPIENTS']||[]).split(",")
   config.action_mailer.perform_caching = false
 

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   crt-app:
-    image: registry.lts.harvard.edu/lts/crt-app:1.4.4
+    image: registry.lts.harvard.edu/lts/crt-app:1.4.5
     build:
       context: ./
       dockerfile: DockerfilePub
diff --git a/env-example.txt b/env-example.txt
@@ -33,6 +33,7 @@ SMTP_ADDRESS=smtp.example.com
 SMTP_PORT=25
 SMTP_DOMAIN=example.com
 # Email notifications optional settings
-SMTP_AUTH=plain
+SMTP_AUTHENTICATION=plain
+SMTP_TLS=false
 SMTP_USERNAME=example
 SMTP_PASSWORD=password