Skip to content

Commit

Permalink
Added better boolean env checks and requireTLS option to prod mail se…
Browse files Browse the repository at this point in the history
…rver

mention #19 mention #18
  • Loading branch information
Killian Brackey committed Apr 25, 2017
1 parent 09fe065 commit b5532c9
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ function CheckEnvVar(varname, defaultvalue)
// Domain Variables
var devDomain = CheckEnvVar('DEV_DOMAIN', 'http://localhost:2368');
var devSSLDomain = CheckEnvVar('DEV_SSL_DOMAIN', ''); // Won't advertise its useage, but it's there
var devForceAdminSSL= CheckEnvVar('DEV_FORCE_ADMIN_SSL', false);
var devForceAdminSSL= CheckEnvVar('DEV_FORCE_ADMIN_SSL', 'false') === 'false';

var prodDomain = CheckEnvVar('PROD_DOMAIN', 'http://example.com');
var prodSSLDomain = CheckEnvVar('PROD_SSL_DOMAIN', ''); // Won't advertise its useage, but it's there
var prodForceAdminSSL= CheckEnvVar('DEV_FORCE_ADMIN_SSL', false);
var prodForceAdminSSL= CheckEnvVar('DEV_FORCE_ADMIN_SSL', 'false') === 'false';

//Development Mail Variables
var devMailTransport = CheckEnvVar('DEV_MAIL_TRANSPORT', '');
Expand All @@ -33,9 +33,9 @@ var devMailName = CheckEnvVar('DEV_MAIL_NAME', '');
var devMailUser = CheckEnvVar('DEV_MAIL_USER', '');
var devMailPass = CheckEnvVar('DEV_MAIL_PASS', '');
var devMailFrom = CheckEnvVar('DEV_MAIL_FROM', '');
var devMailSecureConnection = CheckEnvVar('DEV_MAIL_SECURE_CONNECTION', false);
var devMailSecureConnection = CheckEnvVar('DEV_MAIL_SECURE_CONNECTION', 'false') === 'true';
var devMailPort = CheckEnvVar('DEV_MAIL_PORT', 25);
var devMailIgnoreTLS = CheckEnvVar('DEV_MAIL_IGNORE_TLS', false);
var devMailIgnoreTLS = CheckEnvVar('DEV_MAIL_IGNORE_TLS', 'true') === 'true';
var devMailDebug = CheckEnvVar('DEV_MAIL_DEBUG', '');

if (devMailService != '') {
Expand All @@ -52,10 +52,11 @@ var prodMailName = CheckEnvVar('DEV_MAIL_NAME', '');
var prodMailUser = CheckEnvVar('PROD_MAIL_USER', '');
var prodMailPass = CheckEnvVar('PROD_MAIL_PASS', '');
var prodMailFrom = CheckEnvVar('PROD_MAIL_FROM', '');
var prodMailSecureConnection = CheckEnvVar('PROD_MAIL_SECURE_CONNECTION', false);
var prodMailSecureConnection = CheckEnvVar('PROD_MAIL_SECURE_CONNECTION', 'false') === 'true';
var prodMailPort = CheckEnvVar('PROD_MAIL_PORT', 25);
var prodMailIgnoreTLS = CheckEnvVar('PROD_MAIL_IGNORE_TLS', false);
var prodMailIgnoreTLS = CheckEnvVar('PROD_MAIL_IGNORE_TLS', 'false') === 'true';
var prodMailDebug = CheckEnvVar('PROD_MAIL_DEBUG', '');
var prodMailRequireTLS = CheckEnvVar('PROD_MAIL_REQUIRE_TLS', 'true') === 'true'

if (prodMailService != '') {
prodMailHost = undefined
Expand All @@ -76,6 +77,7 @@ config = {
transport: prodMailTransport,
options: {
ignoreTLS: prodMailIgnoreTLS,
requireTLS: prodMailRequireTLS,
host: prodMailHost,
port: prodMailPort,
debug: prodMailDebug,
Expand Down

0 comments on commit b5532c9

Please sign in to comment.