github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ho-dockerise

Browse source
This commit is contained in:
Henry Oswald 2018-03-02 18:18:18 +00:00
commit d97ccc6e07
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/clsi/config/settings.defaults.coffee
View file

@ -19,7 +19,8 @@ module.exports =
internal: internal:
clsi: clsi:
port: 3013 port: 3013
host: process.env["LISTEN_ADDRESS"] or "0.0.0.0" host: process.env["LISTEN_ADDRESS"] or "localhost"
apis: apis:
clsi: clsi:
url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013" url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013"
@ -44,5 +45,4 @@ if process.env["COMMAND_RUNNER"]
module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"] module.exports.path.sandboxedCompilesHostDir = process.env["COMPILES_HOST_DIR"]
#TODO this can be deleted once module is merged in
module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"] module.exports.path.synctexBinHostPath = process.env["SYNCTEX_BIN_HOST_PATH"]

2
services/clsi/package.json
View file

@ -24,7 +24,7 @@
"compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests", "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests",
"nodemon": "nodemon --config nodemon.json" "nodemon": "nodemon --config nodemon.json"
}, },
"author": "James Allen <james@sharelatex.com>", "author": "James Allen <james@sharelatex.com>",
"dependencies": { "dependencies": {
"async": "0.2.9", "async": "0.2.9",
"body-parser": "^1.2.0", "body-parser": "^1.2.0",