github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image

Browse source
This commit is contained in:
ShareLaTeX 2016-06-27 13:52:31 +00:00
commit 2d8f594ffb
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server-ce/settings.coffee
View file

@ -389,6 +389,8 @@ settings =
user: httpAuthUser user: httpAuthUser
pass: httpAuthPass pass: httpAuthPass
references:undefined references:undefined
notifications:undefined
# documentupdater: # documentupdater:
# url : "http://localhost:#{docUpdaterPort}" # url : "http://localhost:#{docUpdaterPort}"
# clsi: # clsi:
@ -441,7 +443,7 @@ if process.env["SHARELATEX_HEADER"]?
# http://www.nodemailer.com/docs/transports # http://www.nodemailer.com/docs/transports
if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"] if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]?
settings.email = settings.email =
fromAddress: process.env["SHARELATEX_EMAIL_FROM_ADDRESS"] fromAddress: process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]
@ -455,12 +457,16 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]
host: process.env["SHARELATEX_EMAIL_SMTP_HOST"] host: process.env["SHARELATEX_EMAIL_SMTP_HOST"]
port: process.env["SHARELATEX_EMAIL_SMTP_PORT"], port: process.env["SHARELATEX_EMAIL_SMTP_PORT"],
secure: process.env["SHARELATEX_EMAIL_SMTP_SECURE"] 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 = settings.email.parameters.auth =
user: process.env["SHARELATEX_EMAIL_SMTP_USER"] user: process.env["SHARELATEX_EMAIL_SMTP_USER"]
pass: process.env["SHARELATEX_EMAIL_SMTP_PASS"] 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 # Password Settings
# ----------- # -----------