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

Revert "Remove settings.apis.v1 defaults (#2365)" (#2388)

Browse source 
This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad.

GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8
This commit is contained in:
Miguel Serrano 2019-11-20 12:45:31 +01:00 committed by sharelatex
parent 81103c93e6
commit 475e6971a2
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,16 +15,10 @@ httpAuthUsers[httpAuthUser] = httpAuthPass
sessionSecret = process.env['SESSION_SECRET'] or "secret-please-change"
if process.env['V1_API_URL'] or process.env['V1_HOST']
v1Api =
url: process.env['V1_API_URL'] or "http://#{process.env['V1_HOST']}:5000"
user: process.env['V1_API_USER']
pass: process.env['V1_API_PASSWORD']
else
v1Api =
url: undefined
user: undefined
pass: undefined
v1Api =
url: process.env['V1_API_URL'] or "http://#{process.env['V1_HOST'] or 'localhost'}:5000"
user: process.env['V1_API_USER'] or 'overleaf'
pass: process.env['V1_API_PASSWORD'] or 'password'
module.exports = settings =

6
services/web/test/acceptance/config/settings.test.coffee
View file

@ -1,16 +1,10 @@
v1Api =
url: "http://#{process.env['V1_HOST'] or 'localhost'}:5000"
user: process.env['V1_API_USER'] or 'overleaf'
pass: process.env['V1_API_PASSWORD'] or 'password'
module.exports =
enableSubscriptions: true
apis:
v1:
url: v1Api.url
user: v1Api.user
pass: v1Api.pass
recurly:
# Set up our own mock recurly server
url: 'http://localhost:6034'