From a40360feafe6483b9592c7d2c80999065a6ccc9a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 9 Jun 2016 16:21:54 +0100 Subject: [PATCH 1/2] allow header and footer to be configured via env vars --- server-ce/settings.coffee | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee index 55c964012b..1f782a68c6 100644 --- a/server-ce/settings.coffee +++ b/server-ce/settings.coffee @@ -136,6 +136,14 @@ settings = # address and http/https protocol information. 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 # --------------------- From 342ab43c6b09a19dcaaff19ad1b6f10c5644fbaf Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 9 Jun 2016 16:22:27 +0100 Subject: [PATCH 2/2] point to texlive 2016 --- server-ce/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index d7ca93d357..097de9a123 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -88,7 +88,7 @@ ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf RUN rm -r /install-tl-unx; \ 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 tlmgr install latexmk