From b79dfcd477dcd5a814374a5ca343b1d6d3a78541 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 19 Aug 2014 14:10:37 +0100 Subject: [PATCH 1/3] Lock down module versions --- services/filestore/package.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/filestore/package.json b/services/filestore/package.json index 5b97e24e40..9f10aacd72 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -1,10 +1,15 @@ { "name": "filestore-sharelatex", "version": "0.0.1", + "description": "An API for CRUD operations on binary files stored in S3", + "repository": { + "type": "git", + "url": "https://github.com/sharelatex/filestore-sharelatex.git" + }, "dependencies": { - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master", - "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", + "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", + "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.0.0", "request": "2.14.0", "lynx": "0.0.11", "grunt-mocha-test": "~0.8.2", From 72ad81887a6ae6bdb7c1b86f25cc0bf76f020e3d Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 19 Aug 2014 14:10:48 +0100 Subject: [PATCH 2/3] Release version 0.1.0 --- services/filestore/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/filestore/package.json b/services/filestore/package.json index 9f10aacd72..60bc7d7500 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -1,6 +1,6 @@ { "name": "filestore-sharelatex", - "version": "0.0.1", + "version": "0.1.0", "description": "An API for CRUD operations on binary files stored in S3", "repository": { "type": "git", From 9d97d1dc5382b724289f4ba14eb9623aaa7898d1 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 27 Nov 2014 11:08:29 +0000 Subject: [PATCH 3/3] Handle templates locally ok --- services/filestore/.gitignore | 1 + services/filestore/config/settings.defaults.coffee | 1 + services/filestore/template_files/.gitignore | 0 3 files changed, 2 insertions(+) create mode 100644 services/filestore/template_files/.gitignore diff --git a/services/filestore/.gitignore b/services/filestore/.gitignore index 723e09aef3..7d881c3ca7 100644 --- a/services/filestore/.gitignore +++ b/services/filestore/.gitignore @@ -56,6 +56,7 @@ test/unit/js/ test/acceptence/js user_files/* +template_files/* **.swp diff --git a/services/filestore/config/settings.defaults.coffee b/services/filestore/config/settings.defaults.coffee index a7c92528ac..dccefea525 100644 --- a/services/filestore/config/settings.defaults.coffee +++ b/services/filestore/config/settings.defaults.coffee @@ -21,6 +21,7 @@ module.exports = # Must contain full path, e.g. "/var/lib/sharelatex/data". # This path must exist, not be tmpfs and be writable to by the user sharelatex is run as. user_files: Path.resolve(__dirname + "/../user_files") + template_files: Path.resolve(__dirname + "/../template_files") # if you are using S3, then fill in your S3 details below # s3: # key: "" diff --git a/services/filestore/template_files/.gitignore b/services/filestore/template_files/.gitignore new file mode 100644 index 0000000000..e69de29bb2