From 10c2665e401be3d7fd379300728c4597084806b3 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 24 Jun 2016 14:06:50 +0100 Subject: [PATCH 1/2] don't call notifications --- settings.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings.coffee b/settings.coffee index 5fb1050505..94fd2939b4 100644 --- a/settings.coffee +++ b/settings.coffee @@ -389,6 +389,8 @@ settings = user: httpAuthUser pass: httpAuthPass references:undefined + notifications:undefined + # documentupdater: # url : "http://localhost:#{docUpdaterPort}" # clsi: From a5b11360d375759bca60e636d548ded7255434f9 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 27 Jun 2016 14:50:46 +0100 Subject: [PATCH 2/2] added SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH and SHARELATEX_EMAIL_SMTP_IGNORE_TLS --- settings.coffee | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/settings.coffee b/settings.coffee index 94fd2939b4..c7e9d1e873 100644 --- a/settings.coffee +++ b/settings.coffee @@ -443,7 +443,7 @@ if process.env["SHARELATEX_HEADER"]? # http://www.nodemailer.com/docs/transports -if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"] +if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]? settings.email = fromAddress: process.env["SHARELATEX_EMAIL_FROM_ADDRESS"] @@ -457,12 +457,16 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"] host: process.env["SHARELATEX_EMAIL_SMTP_HOST"] port: process.env["SHARELATEX_EMAIL_SMTP_PORT"], 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"] +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"] + 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"] # Password Settings # -----------