From 926e6fee41cc4a7de230a243ea51b01fdd4d578c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 27 Jun 2016 15:19:43 +0100 Subject: [PATCH] don't try and put properties on email if basic email is not configured --- server-ce/settings.coffee | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee index c7e9d1e873..fe4b9303a1 100644 --- a/server-ce/settings.coffee +++ b/server-ce/settings.coffee @@ -459,14 +459,14 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]? secure: process.env["SHARELATEX_EMAIL_SMTP_SECURE"] ignoreTLS: process.env["SHARELATEX_EMAIL_SMTP_IGNORE_TLS"] -if process.env["SHARELATEX_EMAIL_SMTP_USER"]? or process.env["SHARELATEX_EMAIL_SMTP_PASS"]? - settings.email.parameters.auth = - user: process.env["SHARELATEX_EMAIL_SMTP_USER"] - pass: process.env["SHARELATEX_EMAIL_SMTP_PASS"] + if process.env["SHARELATEX_EMAIL_SMTP_USER"]? or process.env["SHARELATEX_EMAIL_SMTP_PASS"]? + settings.email.parameters.auth = + user: process.env["SHARELATEX_EMAIL_SMTP_USER"] + pass: process.env["SHARELATEX_EMAIL_SMTP_PASS"] -if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]? - settings.email.parameters.tls = - rejectUnauthorized: process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"] + if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]? + settings.email.parameters.tls = + rejectUnauthorized: process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"] # Password Settings # -----------