Bläddra i källkod

Add CLSI to known repos

James Allen 12 år sedan
förälder
incheckning
d02c777e55
2 ändrade filer med 29 tillägg och 11 borttagningar
  1. 12 9
      Gruntfile.coffee
  2. 17 2
      config/settings.development.coffee

+ 12 - 9
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"
 						]

+ 17 - 2
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
 	# -------------------