From bb49809776e84a83cf4c6dec0c7270ee365e027d Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 3 Aug 2016 16:21:44 +0100 Subject: [PATCH 1/3] add contacts to services.js --- services.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services.js b/services.js index be4da8698a..3614b2c020 100644 --- a/services.js +++ b/services.js @@ -40,4 +40,8 @@ module.exports = name: "spelling", repo: "https://github.com/sharelatex/spelling-sharelatex.git", version: "master" +}, { + name: "contacts", + repo: "https://github.com/sharelatex/contacts-sharelatex.git", + version: "master" }] From 445780aa2c70fa76b5b22ea11e76ec7c7f0794ae Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 3 Aug 2016 16:22:10 +0100 Subject: [PATCH 2/3] add template links SHARELATEX_NEW_PROJECT_TEMPLATE_LINKS to config file --- settings.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/settings.coffee b/settings.coffee index e2f25ad934..86d49e39ec 100644 --- a/settings.coffee +++ b/settings.coffee @@ -565,6 +565,8 @@ if process.env["SHARELATEX_TEMPLATES_USER_ID"] settings.templates = mountPointUrl: "/templates" user_id: process.env["SHARELATEX_TEMPLATES_USER_ID"] + + settings.templateLinks: parse(process.env["SHARELATEX_NEW_PROJECT_TEMPLATE_LINKS"]) # /Learn From 10b6f88f3b70f7444c2c5260feac9a78fc49673e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 3 Aug 2016 16:22:17 +0100 Subject: [PATCH 3/3] add logrotate --- Dockerfile | 2 ++ logrotate/sharelatex | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 logrotate/sharelatex diff --git a/Dockerfile b/Dockerfile index dba9ac2066..41aaa7e20c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ RUN apt-get update RUN curl -sL https://deb.nodesource.com/setup | sudo bash - RUN apt-get install -y build-essential wget nodejs unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-no aspell-nr aspell-ns aspell-or aspell-pa aspell-pl aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-ta aspell-te aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu +ADD logrotate/sharelatex /etc/logrotate.d/sharelatex + WORKDIR /opt RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && tar xzf qpdf-6.0.0.tar.gz WORKDIR /opt/qpdf-6.0.0 diff --git a/logrotate/sharelatex b/logrotate/sharelatex new file mode 100644 index 0000000000..efc51cc6c9 --- /dev/null +++ b/logrotate/sharelatex @@ -0,0 +1,9 @@ +/var/log/sharelatex/*.log { + daily + missingok + rotate 5 + compress + copytruncate + notifempty + create 644 root adm +} \ No newline at end of file