From dd5c114dc2ea82bd521ff6327db1ee129328ca32 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 8 Dec 2016 18:36:20 -1000
Subject: [PATCH] don't use well-known email settings

---
 docker-compose.yml |  1 +
 services/mailer.js | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d7a180277..16df60095 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     restart: always
     ports:
       - "5000:5000"
+      - "2525:2525"
     environment:
       - "TALK_PORT=5000"
       - "TALK_MONGO_URL=mongodb://mongo"
diff --git a/services/mailer.js b/services/mailer.js
index b7d621954..fe07f063b 100644
--- a/services/mailer.js
+++ b/services/mailer.js
@@ -3,7 +3,7 @@ const nodemailer = require('nodemailer');
 const smtpRequiredProps = [
   'TALK_SMTP_USERNAME',
   'TALK_SMTP_PASSWORD',
-  'TALK_SMTP_PROVIDER'
+  'TALK_SMTP_HOST'
 ];
 
 smtpRequiredProps.forEach(prop => {
@@ -13,9 +13,7 @@ smtpRequiredProps.forEach(prop => {
 });
 
 const options = {
-  // list of providers here:
-  // https://github.com/nodemailer/nodemailer-wellknown#supported-services
-  service: process.env.TALK_SMTP_PROVIDER,
+  host: process.env.TALK_SMTP_HOST,
   auth: {
     user: process.env.TALK_SMTP_USERNAME,
     pass: process.env.TALK_SMTP_PASSWORD
@@ -24,10 +22,8 @@ const options = {
 
 if (process.env.TALK_SMTP_PORT) {
   options.port = process.env.TALK_SMTP_PORT;
-}
-
-if (process.env.TALK_SMTP_HOST) {
-  options.host = process.env.TALK_SMTP_HOST;
+} else {
+  options.port = 25;
 }
 
 const defaultTransporter = nodemailer.createTransport(options);