From 246496a468abdd3f4056bf8fd88801df71fe45db Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 23 May 2016 11:30:25 +0100 Subject: [PATCH] added docker and and templates options for server pro --- settings.coffee | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/settings.coffee b/settings.coffee index 165d4c16d0..06d34c567a 100644 --- a/settings.coffee +++ b/settings.coffee @@ -451,6 +451,15 @@ if process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or process.env["SHARELA length: {min:process.env["SHARELATEX_PASSWORD_VALIDATION_MIN_LENGTH"] or 8, max: process.env["SHARELATEX_PASSWORD_VALIDATION_MAX_LENGTH"] or 50} + + +####################### +# ShareLaTeX Server Pro +####################### + + + + # LDAP - SERVER PRO ONLY # ---------- # Settings below use a working LDAP test server kindly provided by forumsys.com @@ -475,6 +484,26 @@ if process.env["SHARELATEX_LDAP_HOST"] rejectUnauthorized: process.env["SHARELATEX_LDAP_TLS_OPTS_REJECT_UNAUTH"] or false ca: process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"] # e.g.'/etc/ldap/ca_certs.pem' +# Compiler +# -------- + +if process.env["DOCKER_IN_DOCKER"] + clsi: + commandRunner: "docker-runner-sharelatex" + docker: + image: "sharelatex-texlive" + env: + PATH: process.env["COMPILER_PATH"] or "/usr/local/texlive/2015/bin/x86_64-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + user: "tex" + + +# Templates +# --------- +if process.env["SHARELATEX_TEMPLATES_USER_ID"] + templates: + mountPointUrl: "/templates" + user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"] +