Merge pull request #2583 from mkllnk/seed-mail-connection-type

Configure mail TLS or SSL connection when seeding
openfoodfoundation · Aug 26, 2018 · 44faa11 · 44faa11
2 parents 8eee8f9 + b158c92
commit 44faa11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/config/application.yml.example b/config/application.yml.example
@@ -30,6 +30,7 @@ SMTP_USERNAME: 'ofn'
 SMTP_PASSWORD: 'f00d'
 
 # Optional mail settings
+# MAIL_SECURE_CONNECTION: 'TLS' # 'None' (default), 'SSL' or 'TLS'
 # MAILS_FROM: [email protected]
 # MAIL_BCC: [email protected]
 

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -42,7 +42,7 @@ def create_mail_method
     preferred_mail_auth_type: 'login',
     preferred_smtp_username: ENV.fetch('SMTP_USERNAME'),
     preferred_smtp_password: ENV.fetch('SMTP_PASSWORD'),
-    preferred_secure_connection_type: 'None',
+    preferred_secure_connection_type: ENV.fetch('MAIL_SECURE_CONNECTION', 'None'),
     preferred_mails_from: ENV.fetch('MAILS_FROM', "no-reply@#{ENV.fetch('MAIL_DOMAIN')}"),
     preferred_mail_bcc: ENV.fetch('MAIL_BCC', ''),
     preferred_intercept_email: ''