From 4d4d048c73c827c10cfdf48a6d05b44311df2807 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 13 Feb 2014 12:37:47 +0000 Subject: [PATCH] Add CLSI to known repos --- server-ce/Gruntfile.coffee | 21 +++++++++++--------- server-ce/config/settings.development.coffee | 19 ++++++++++++++++-- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/server-ce/Gruntfile.coffee b/server-ce/Gruntfile.coffee index 62e45a1a99..63222b4773 100644 --- a/server-ce/Gruntfile.coffee +++ b/server-ce/Gruntfile.coffee @@ -9,6 +9,9 @@ SERVICES = [{ }, { name: "document-updater" repo: "git@github.com:sharelatex/document-updater-sharelatex.git" +}, { + name: "clsi" + repo: "git@github.com:sharelatex/clsi-sharelatex.git" }] @@ -18,17 +21,19 @@ module.exports = (grunt) -> grunt.loadNpmTasks 'grunt-available-tasks' grunt.loadNpmTasks 'grunt-concurrent' + execute = {} + for service in SERVICES + execute[service.name] = + src: "#{service.name}/app.js" + grunt.initConfig - execute: - web: - src: "web/app.js" - 'document-updater': - src: "document-updater/app.js" + execute: execute concurrent: all: - tasks: ['run:web', 'run:document-updater'] + tasks: ("run:#{service.name}" for service in SERVICES) options: + limit: SERVICES.length logConcurrentOutput: true availabletasks: @@ -45,10 +50,8 @@ module.exports = (grunt) -> "Run tasks": [ "run" "run:all" - "run:web" - "run:document-updater" "default" - ] + ].concat ("run:#{service.name}" for service in SERVICES) "Misc": [ "help" ] diff --git a/server-ce/config/settings.development.coffee b/server-ce/config/settings.development.coffee index 46d8ce0da8..f75f555d4f 100644 --- a/server-ce/config/settings.development.coffee +++ b/server-ce/config/settings.development.coffee @@ -42,6 +42,12 @@ module.exports = port: "6379" password: "" + mysql: + clsi: + database: "clsi" + username: "clsi" + password: "" + # Service locations # ----------------- @@ -51,8 +57,13 @@ module.exports = internal: web: port: webPort = 3000 + host: "localhost" documentupdater: port: docUpdaterPort = 3003 + host: "localhost" + clsi: + port: clsiPort = 3013 + host: "localhost" # Tell each service where to find the other services. If everything # is running locally then this is easy, but they exist as separate config @@ -64,6 +75,8 @@ module.exports = pass: httpAuthPass documentupdater: url : "http://localhost:#{docUpdaterPort}" + clsi: + url: "http://localhost:#{clsiPort}" thirdPartyDataStore: url : "http://localhost:3002" emptyProjectFlushDelayMiliseconds: 5 * seconds @@ -88,8 +101,6 @@ module.exports = port: 3008 filestore: url: "http://localhost:3009" - clsi: - url: "http://localhost:3013" templates_api: url: "http://localhost:3014" @@ -182,6 +193,10 @@ module.exports = # that need processing but may be too big for memory, then write # them to disk here). dumpFolder: Path.resolve "data/dumpFolder" + # Where to write the project to disk before running LaTeX on it + compilesDir: Path.resolve(__dirname + "/../compiles") + # Where to cache downloaded URLs for the CLSI + clsiCacheDir: Path.resolve(__dirname + "/../cache") # Automatic Snapshots # -------------------