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

fix templates & clsi set dynamically. and more robust bool vals from env vars

Browse source
This commit is contained in:
Henry Oswald 2016-05-24 16:43:08 +01:00
parent a5d1c45c53
commit 879a23c857
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server-ce/settings.coffee
View file

@ -476,22 +476,22 @@ 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"] or false anonymous: process.env["SHARELATEX_LDAP_ANONYMOUS"] == "true"
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"] or false starttls: process.env["SHARELATEX_LDAP_TLS"] == "true"
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"]
if process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"] if process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"]
settings.ldap.tlsOptions = settings.ldap.tlsOptions =
rejectUnauthorized: process.env["SHARELATEX_LDAP_TLS_OPTS_REJECT_UNAUTH"] or false rejectUnauthorized: process.env["SHARELATEX_LDAP_TLS_OPTS_REJECT_UNAUTH"] == "true"
ca: process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"] # e.g.'/etc/ldap/ca_certs.pem' ca: process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"] # e.g.'/etc/ldap/ca_certs.pem'
# Compiler # Compiler
# -------- # --------
if process.env["DOCKER_IN_DOCKER"] if process.env["DOCKER_IN_DOCKER"] == "true"
clsi: settings.clsi =
commandRunner: "docker-runner-sharelatex" commandRunner: "docker-runner-sharelatex"
docker: docker:
image: "sharelatex-texlive" image: "sharelatex-texlive"
@ -503,7 +503,7 @@ if process.env["DOCKER_IN_DOCKER"]
# Templates # Templates
# --------- # ---------
if process.env["SHARELATEX_TEMPLATES_USER_ID"] if process.env["SHARELATEX_TEMPLATES_USER_ID"]
templates: settings.templates =
mountPointUrl: "/templates" mountPointUrl: "/templates"
user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"] user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"]