From d8c9063ac5d13eaadc9dc6482d8f2a81905b0c77 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Mon, 1 May 2023 13:44:49 -0600 Subject: [PATCH] Moved mail env vars to single uri var --- .env.sample | 3 +-- docker-compose.yml.sample | 10 ++-------- lib/mailer.js | 12 +----------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.env.sample b/.env.sample index 82bda36..37ae3c6 100644 --- a/.env.sample +++ b/.env.sample @@ -13,8 +13,7 @@ SALES_EMAIL="sales@example.com" CONTACT_EMAIL="contact@example.com" # Mailserver -MAIL_SERVER="example.com" -MAIL_PORT="25" +MAIL_URI="smtps://username:password@example.com:587" CONTACT_MAIL_FROM="Company Contact " SALES_MAIL_FROM="Company Sales " BUGS_MAIL_FROM="Company Bug Reports " diff --git a/docker-compose.yml.sample b/docker-compose.yml.sample index 772afd6..c04fd70 100644 --- a/docker-compose.yml.sample +++ b/docker-compose.yml.sample @@ -43,13 +43,10 @@ services: - API_PORT=${API_PORT} - ADMIN_EMAIL=${ADMIN_EMAIL} - SALES_EMAIL=${SALES_EMAIL} - - MAIL_SERVER=${MAIL_SERVER} - - MAIL_PORT=${MAIL_PORT} + - MAIL_URI=${MAIL_URI} - CONTACT_MAIL_FROM=${CONTACT_MAIL_FROM} - SALES_MAIL_FROM=${SALES_MAIL_FROM} - BUGS_MAIL_FROM=${BUGS_MAIL_FROM} - - MAIL_USER=${MAIL_USER} - - MAIL_PASS=${MAIL_PASS} - MONEROPAY_URL=${MONEROPAY_URL} volumes: - "/etc/timezone:/etc/timezone:ro" @@ -71,10 +68,7 @@ services: - STRIPE_SEC=${STRIPE_SEC} - STRIPE_LISTENER_PORT=${STRIPE_LISTENER_PORT} - SALES_EMAIL=${SALES_EMAIL} - - MAIL_SERVER=${MAIL_SERVER} - - MAIL_PORT=${MAIL_PORT} - - MAIL_USER=${MAIL_USER} - - MAIL_PASS=${MAIL_PASS} + - MAIL_URI=${MAIL_URI} volumes: - "/etc/timezone:/etc/timezone:ro" - "./_src:/app/_src" diff --git a/lib/mailer.js b/lib/mailer.js index 0050f49..3865a5d 100644 --- a/lib/mailer.js +++ b/lib/mailer.js @@ -1,14 +1,4 @@ 'use strict' require('dotenv').config() -module.exports = require('nodemailer').createTransport({ - host: process.env.MAIL_SERVER, - port: process.env.MAIL_PORT, - auth: { - user: process.env.MAIL_USER, - pass: process.env.MAIL_PASS, - }, - tls: { - rejectUnauthorized: false, - }, -}) +module.exports = require('nodemailer').createTransport(process.env.MAIL_URI)