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

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

Browse source
This commit is contained in:
ShareLaTeX 2016-06-09 15:52:36 +00:00
commit 289c234889
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server-ce/Dockerfile
View file

@ -88,7 +88,7 @@ ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
RUN rm -r /install-tl-unx; \ RUN rm -r /install-tl-unx; \
rm install-tl-unx.tar.gz rm install-tl-unx.tar.gz
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2015/bin/x86_64-linux/ ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2016/bin/x86_64-linux/
RUN apt-get update RUN apt-get update
RUN tlmgr install latexmk RUN tlmgr install latexmk

8
server-ce/settings.coffee
View file

@ -136,6 +136,14 @@ settings =
# address and http/https protocol information. # address and http/https protocol information.
behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false
if process.env["SHARELATEX_LEFT_FOOTER"]
left_footer: process.env["SHARELATEX_LEFT_FOOTER"]
if process.env["SHARELATEX_RIGHT_FOOTER"]
right_footer: process.env["SHARELATEX_RIGHT_FOOTER"]
if process.env["SHARELATEX_HEADER"]
header: process.env["SHARELATEX_HEADER"]
# Spell Check Languages # Spell Check Languages
# --------------------- # ---------------------