github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3366 from overleaf/em-remove-queues-redis-fallback

Browse source 
Remove fallback when QUEUES_REDIS_* variables are not set

GitOrigin-RevId: c20e30e33da3193dad691a4ae0b177a6ae0c0066
This commit is contained in:
Jessica Lawshe 2020-11-09 08:52:44 -06:00 committed by Copybot
parent d138837049
commit 63a60765c7
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,9 +94,9 @@ module.exports = settings =
maxRetriesPerRequest: parseInt(process.env["REDIS_MAX_RETRIES_PER_REQUEST"] || '20') maxRetriesPerRequest: parseInt(process.env["REDIS_MAX_RETRIES_PER_REQUEST"] || '20')
queues: queues:
host: process.env['QUEUES_REDIS_HOST'] || process.env['REDIS_HOST'] || 'localhost' host: process.env['QUEUES_REDIS_HOST'] || 'localhost'
port: process.env['QUEUES_REDIS_PORT'] || process.env['REDIS_PORT'] || '6379' port: process.env['QUEUES_REDIS_PORT'] || '6379'
password: process.env['QUEUES_REDIS_PASSWORD'] || process.env['REDIS_PASSWORD'] || '' password: process.env['QUEUES_REDIS_PASSWORD'] || ''
# Service locations # Service locations
# ----------------- # -----------------

1
services/web/docker-compose.ci.yml
View file

@ -20,6 +20,7 @@ services:
environment: environment:
BCRYPT_ROUNDS: 1 BCRYPT_ROUNDS: 1
REDIS_HOST: redis REDIS_HOST: redis
QUEUES_REDIS_HOST: redis
MONGO_URL: "mongodb://mongo/sharelatex" MONGO_URL: "mongodb://mongo/sharelatex"
SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true' SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'
PROJECT_HISTORY_ENABLED: 'true' PROJECT_HISTORY_ENABLED: 'true'

1
services/web/docker-compose.yml
View file

@ -26,6 +26,7 @@ services:
environment: environment:
BCRYPT_ROUNDS: 1 BCRYPT_ROUNDS: 1
REDIS_HOST: redis REDIS_HOST: redis
QUEUES_REDIS_HOST: redis
MONGO_URL: "mongodb://mongo/sharelatex" MONGO_URL: "mongodb://mongo/sharelatex"
SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true' SHARELATEX_ALLOW_PUBLIC_ACCESS: 'true'
PROJECT_HISTORY_ENABLED: 'true' PROJECT_HISTORY_ENABLED: 'true'