From 735775662582022407df51e011150e9c51d3cb44 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Thu, 25 Jan 2018 15:40:22 +0000 Subject: [PATCH] Fix MAILER_STMP_SECURE This should resolve https://github.com/tellform/tellform/issues/281, matching the description in the Configuration section of `README.md`. This also corrects the case of `TRUE` in an example. --- README.md | 2 +- config/env/all.js | 2 +- config/env/development.js | 2 +- config/env/secure.js | 2 +- config/env/test.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4f5a35ce..afa7cd57 100755 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ MAILER_SERVICE_PROVIDER=SendGrid # Note: MAILER_SMTP_HOST will override MAILER_SERVICE_PROVIDER MAILER_SMTP_HOST=smtp.domain.com MAILER_SMTP_PORT=465 -MAILER_SMTP_SECURE=true +MAILER_SMTP_SECURE=TRUE ``` diff --git a/config/env/all.js b/config/env/all.js index 7130af77..35fe1db4 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -40,7 +40,7 @@ module.exports = { options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 465, - secure: process.env.MAILER_SMTP_SECURE || true, + secure: (process.env.MAILER_SMTP_SECURE === 'TRUE'), auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || '' diff --git a/config/env/development.js b/config/env/development.js index a44816a7..a62673f6 100755 --- a/config/env/development.js +++ b/config/env/development.js @@ -21,7 +21,7 @@ module.exports = { options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 465, - secure: process.env.MAILER_SMTP_SECURE || true, + secure: (process.env.MAILER_SMTP_SECURE === 'TRUE'), auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || '' diff --git a/config/env/secure.js b/config/env/secure.js index db1c2bdb..bc99aeb5 100755 --- a/config/env/secure.js +++ b/config/env/secure.js @@ -44,7 +44,7 @@ module.exports = { options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 587, - secure: process.env.MAILER_SMTP_SECURE || true, + secure: (process.env.MAILER_SMTP_SECURE === 'TRUE'), auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || '' diff --git a/config/env/test.js b/config/env/test.js index c6731236..d3a02f24 100755 --- a/config/env/test.js +++ b/config/env/test.js @@ -30,7 +30,7 @@ module.exports = { options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set host: process.env.MAILER_SMTP_HOST || '', port: process.env.MAILER_SMTP_PORT || 587, - secure: process.env.MAILER_SMTP_SECURE || true, + secure: (process.env.MAILER_SMTP_SECURE === 'TRUE'), auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || ''