mirror of
https://github.com/overleaf/overleaf.git
synced 2024-09-16 02:52:31 -04:00
added learn wiki option and parse helper method
This commit is contained in:
parent
926e6fee41
commit
5786162e09
1 changed files with 20 additions and 6 deletions
|
@ -7,6 +7,16 @@ httpAuthPass = "CRYPTO_RANDOM" # Randomly generated for you
|
||||||
httpAuthUsers = {}
|
httpAuthUsers = {}
|
||||||
httpAuthUsers[httpAuthUser] = httpAuthPass
|
httpAuthUsers[httpAuthUser] = httpAuthPass
|
||||||
|
|
||||||
|
parse = (option)->
|
||||||
|
if option?
|
||||||
|
try
|
||||||
|
opt = JSON.parse(option)
|
||||||
|
return opt
|
||||||
|
catch err
|
||||||
|
console.error "problem parsing #{option}, invalid JSON"
|
||||||
|
return undefined
|
||||||
|
|
||||||
|
|
||||||
DATA_DIR = '/var/lib/sharelatex/data'
|
DATA_DIR = '/var/lib/sharelatex/data'
|
||||||
TMP_DIR = '/var/lib/sharelatex/tmp'
|
TMP_DIR = '/var/lib/sharelatex/tmp'
|
||||||
|
|
||||||
|
@ -456,9 +466,9 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]?
|
||||||
#SMTP Creds
|
#SMTP Creds
|
||||||
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: parse(process.env["SHARELATEX_EMAIL_SMTP_SECURE"])
|
||||||
ignoreTLS: process.env["SHARELATEX_EMAIL_SMTP_IGNORE_TLS"]
|
ignoreTLS: parse(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"]
|
||||||
|
@ -466,7 +476,7 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]?
|
||||||
|
|
||||||
if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]?
|
if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]?
|
||||||
settings.email.parameters.tls =
|
settings.email.parameters.tls =
|
||||||
rejectUnauthorized: process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]
|
rejectUnauthorized: parse(process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"])
|
||||||
|
|
||||||
# Password Settings
|
# Password Settings
|
||||||
# -----------
|
# -----------
|
||||||
|
@ -504,10 +514,10 @@ if process.env["SHARELATEX_LDAP_HOST"]
|
||||||
fieldName: process.env["SHARELATEX_LDAP_FIELD_NAME"] or 'LDAP User'
|
fieldName: process.env["SHARELATEX_LDAP_FIELD_NAME"] or 'LDAP User'
|
||||||
placeholder: process.env["SHARELATEX_LDAP_PLACEHOLDER"] or 'LDAP User ID'
|
placeholder: process.env["SHARELATEX_LDAP_PLACEHOLDER"] or 'LDAP User ID'
|
||||||
emailAtt: process.env["SHARELATEX_LDAP_EMAIL_ATT"] or 'mail'
|
emailAtt: process.env["SHARELATEX_LDAP_EMAIL_ATT"] or 'mail'
|
||||||
anonymous: process.env["SHARELATEX_LDAP_ANONYMOUS"] == "true"
|
anonymous: parse(process.env["SHARELATEX_LDAP_ANONYMOUS"])
|
||||||
adminDN: process.env["SHARELATEX_LDAP_ADMIN_DN"]
|
adminDN: process.env["SHARELATEX_LDAP_ADMIN_DN"]
|
||||||
adminPW: process.env["SHARELATEX_LDAP_ADMIN_PW"]
|
adminPW: process.env["SHARELATEX_LDAP_ADMIN_PW"]
|
||||||
starttls: process.env["SHARELATEX_LDAP_TLS"] == "true"
|
starttls: parse(process.env["SHARELATEX_LDAP_TLS"])
|
||||||
nameAtt: process.env["SHARELATEX_LDAP_NAME_ATT"]
|
nameAtt: process.env["SHARELATEX_LDAP_NAME_ATT"]
|
||||||
lastNameAtt: process.env["SHARELATEX_LDAP_LAST_NAME_ATT"]
|
lastNameAtt: process.env["SHARELATEX_LDAP_LAST_NAME_ATT"]
|
||||||
|
|
||||||
|
@ -552,6 +562,10 @@ if process.env["SHARELATEX_TEMPLATES_USER_ID"]
|
||||||
user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"]
|
user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"]
|
||||||
|
|
||||||
|
|
||||||
|
# /Learn
|
||||||
|
# -------
|
||||||
|
if process.env["SHARELATEX_PROXY_LEARN"]?
|
||||||
|
settings.proxyLearn = parse(process.env["SHARELATEX_PROXY_LEARN"])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue