Merge branch 'master' into ho-docker

This commit is contained in:
Henry Oswald 2018-12-05 16:50:41 +00:00
commit d88a40e383

View file

@ -15,7 +15,7 @@ module.exports =
docstore: docstore:
url: "http://#{process.env["DOCSTORE_HOST"] or "localhost"}:3016" url: "http://#{process.env["DOCSTORE_HOST"] or "localhost"}:3016"
web: web:
url: "http://#{process.env["WEB_HOST"] or "localhost"}:3000" url: "http://#{process.env["WEB_HOST"] or "localhost"}:#{process.env['WEB_PORT'] or 3000}"
user: "sharelatex" user: "sharelatex"
pass: "password" pass: "password"
redis: redis: