From 2a03e4822d08dcfb492053db8db605b64ecbd698 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 26 Feb 2015 12:13:56 +0000 Subject: [PATCH 1/3] Don't blow up on missing settings --- Gruntfile.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index df8cf03045..b843b374be 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -88,7 +88,7 @@ module.exports = (grunt) -> shell: migrate: - command: "./node_modules/east/bin/east migrate --adapter east-mongo --url #{settings.mongo.url}" + command: "./node_modules/east/bin/east migrate --adapter east-mongo --url #{settings?.mongo?.url}" availabletasks: tasks: From 4a19804aa90ca76d4541eb667101d33778a95865 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 4 Mar 2015 22:42:11 +0000 Subject: [PATCH 2/3] Use nodejs 0.10.x --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 816cf4958f..d96591d77a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Dependencies ShareLaTeX should run on OS X and Linux. You need: -* [Node.js](http://nodejs.org/) 0.10 or greater. We recommend that you use [nvm](https://github.com/creationix/nvm) to install it. +* [Node.js](http://nodejs.org/) 0.10.x. We recommend that you use [nvm](https://github.com/creationix/nvm) to install it. * The [grunt](http://gruntjs.com/) command line tools (Run `npm install -g grunt-cli` to install them) * A local instance of [Redis](http://redis.io/topics/quickstart) (version 2.6.12 or later) and [MongoDB](http://docs.mongodb.org/manual/installation/) running on their standard ports. * [TeXLive](https://www.tug.org/texlive/) 2013 or later with the `latexmk` program installed. From a2a2c23f76c920f291f04182540fa5e42e0e4364 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 5 Mar 2015 18:06:06 +0000 Subject: [PATCH 3/3] remove whitespace before internal settings and add realtime config to settings.development.coffee.example --- config/settings.development.coffee.example | 103 +++++++++++---------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/config/settings.development.coffee.example b/config/settings.development.coffee.example index 857c8ce2ad..ccc1487605 100644 --- a/config/settings.development.coffee.example +++ b/config/settings.development.coffee.example @@ -63,13 +63,13 @@ module.exports = # To use Amazon S3 as a storage backend, comment out the above config, and # uncomment the following, filling in your key, secret, and bucket name: # - # filestore: - # backend: "s3" - # stores: - # user_files: "BUCKET_NAME" - # s3: - # key: "AWS_KEY" - # secret: "AWS_SECRET" + #filestore: + # backend: "s3" + # stores: + # user_files: "BUCKET_NAME" + # s3: + # key: "AWS_KEY" + # secret: "AWS_SECRET" # # Local disk caching @@ -164,34 +164,37 @@ module.exports = # an HTTP API running on a different port. Generally you # can leave these as they are unless you have some other services # running which conflict, or want to run the web process on port 80. - # internal: - # web: - # port: webPort = 3000 - # host: "localhost" - # documentupdater: - # port: docUpdaterPort = 3003 - # host: "localhost" - # filestore: - # port: filestorePort = 3009 - # host: "localhost" - # chat: - # port: chatPort = 3010 - # host: "localhost" - # tags: - # port: tagsPort = 3012 - # host: "localhost" - # clsi: - # port: clsiPort = 3013 - # host: "localhost" - # trackchanges: - # port: trackchangesPort = 3015 - # host: "localhost" - # docstore: - # port: docstorePort = 3016 - # host: "localhost" - # spelling: + #internal: + # web: + # port: webPort = 3000 + # host: "localhost" + # documentupdater: + # port: docUpdaterPort = 3003 + # host: "localhost" + # filestore: + # port: filestorePort = 3009 + # host: "localhost" + # chat: + # port: chatPort = 3010 + # host: "localhost" + # tags: + # port: tagsPort = 3012 + # host: "localhost" + # clsi: + # port: clsiPort = 3013 + # host: "localhost" + # trackchanges: + # port: trackchangesPort = 3015 + # host: "localhost" + # docstore: + # port: docstorePort = 3016 + # host: "localhost" + # spelling: # port: spellingPort = 3005 - # host: "localhost" + # host: "localhost" + # realTime: + # port: realTimeport = 3026 + # host: "localhost" # If you change the above config, or run some services on remote servers, # you need to tell the other services where to find them: @@ -200,22 +203,22 @@ module.exports = url: "http://localhost:3000" user: httpAuthUser pass: httpAuthPass - # documentupdater: - # url : "http://localhost:#{docUpdaterPort}" - # clsi: - # url: "http://localhost:#{clsiPort}" - # filestore: - # url: "http://localhost:#{filestorePort}" - # trackchanges: - # url: "http://localhost:#{trackchangesPort}" - # docstore: - # url: "http://localhost:#{docstorePort}" - # tags: - # url: "http://localhost:#{tagsPort}" - # spelling: - # url: "http://localhost:#{spellingPort}" - # chat: - # url: "http://localhost:#{chatPort}" + # documentupdater: + # url : "http://localhost:#{docUpdaterPort}" + # clsi: + # url: "http://localhost:#{clsiPort}" + # filestore: + # url: "http://localhost:#{filestorePort}" + # trackchanges: + # url: "http://localhost:#{trackchangesPort}" + # docstore: + # url: "http://localhost:#{docstorePort}" + # tags: + # url: "http://localhost:#{tagsPort}" + # spelling: + # url: "http://localhost:#{spellingPort}" + # chat: + # url: "http://localhost:#{chatPort}" # With lots of incoming and outgoing HTTP connections to different services,