github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-29 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1551 from sharelatex/ho-docker-debug

Browse source 
Add missing config into defaults file

GitOrigin-RevId: 7d47bce6b6b429eab8d2765b081967ce52908c27
This commit is contained in:
Henry Oswald 2019-02-26 10:15:23 +00:00 committed by James Allen
parent b9edc0f414
commit d12dd862c8
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
services/web/config/settings.defaults.coffee
View file

@ -26,17 +26,6 @@ module.exports = settings =
process.env['SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING'] == 'true' process.env['SHARELATEX_ALLOW_ANONYMOUS_READ_AND_WRITE_SHARING'] == 'true'
# File storage
# ------------
#
# ShareLaTeX stores binary files like images in S3.
# Fill in your Amazon S3 credential below.
s3:
key: ""
secret: ""
bucketName : ""
# Databases # Databases
# --------- # ---------
mongo: mongo:
@ -116,6 +105,7 @@ module.exports = settings =
url :"http://#{process.env['TAGS_HOST'] or 'localhost'}:3012" url :"http://#{process.env['TAGS_HOST'] or 'localhost'}:3012"
spelling: spelling:
url : "http://#{process.env['SPELLING_HOST'] or 'localhost'}:3005" url : "http://#{process.env['SPELLING_HOST'] or 'localhost'}:3005"
host: process.env['SPELLING_HOST']
trackchanges: trackchanges:
url : "http://#{process.env['TRACK_CHANGES_HOST'] or 'localhost'}:3015" url : "http://#{process.env['TRACK_CHANGES_HOST'] or 'localhost'}:3015"
project_history: project_history:
@ -173,8 +163,8 @@ module.exports = settings =
pass: v1Api.pass pass: v1Api.pass
v1_history: v1_history:
url: "http://#{process.env['V1_HISTORY_HOST'] or "localhost"}:3100/api" url: "http://#{process.env['V1_HISTORY_HOST'] or "localhost"}:3100/api"
user: 'staging' user: process.env['V1_HISTORY_USER'] or 'staging'
pass: 'password' pass: process.env['V1_HISTORY_PASSWORD'] or 'password'
templates: templates:
user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2" user_id: process.env.TEMPLATES_USER_ID or "5395eb7aad1f29a88756c7f2"
@ -207,10 +197,12 @@ module.exports = settings =
#clsiCookieKey: "clsiserver" #clsiCookieKey: "clsiserver"
# Same, but with http auth credentials. # Same, but with http auth credentials.
httpAuthSiteUrl: 'http://#{httpAuthUser}:#{httpAuthPass}@#{siteUrl}' httpAuthSiteUrl: "http://#{httpAuthUser}:#{httpAuthPass}@#{siteUrl}"
maxEntitiesPerProject: 2000 maxEntitiesPerProject: 2000
maxUploadSize: 50 * 1024 * 1024 # 50 MB
# Security # Security
# -------- # --------
@ -503,8 +495,8 @@ module.exports = settings =
rateLimits: rateLimits:
autoCompile: autoCompile:
everyone: 100 everyone: process.env['RATE_LIMIT_AUTO_COMPILE_EVERYONE'] or 100
standard: 25 standard: process.env['RATE_LIMIT_AUTO_COMPILE_STANDARD'] or 25
# currentImage: "texlive-full:2017.1" # currentImage: "texlive-full:2017.1"
# imageRoot: "<DOCKER REPOSITORY ROOT>" # without any trailing slash # imageRoot: "<DOCKER REPOSITORY ROOT>" # without any trailing slash