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 pull request #818 from sharelatex/ho-backendgroup-config

Browse source 
configure backend group name via config files
This commit is contained in:
Henry Oswald 2018-08-16 10:37:14 +01:00 committed by GitHub
commit 1e1f26b350
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/coffee/Features/Compile/ClsiManager.coffee
View file

@ -7,8 +7,8 @@ ProjectGetter = require("../Project/ProjectGetter")
ProjectEntityHandler = require("../Project/ProjectEntityHandler") ProjectEntityHandler = require("../Project/ProjectEntityHandler")
logger = require "logger-sharelatex" logger = require "logger-sharelatex"
Url = require("url") Url = require("url")
ClsiCookieManager = require("./ClsiCookieManager")() ClsiCookieManager = require("./ClsiCookieManager")(Settings.apis.clsi?.backendGroupName)
NewBackendCloudClsiCookieManager = require("./ClsiCookieManager")("newBackendcloud") NewBackendCloudClsiCookieManager = require("./ClsiCookieManager")(Settings.apis.clsi_new?.backendGroupName)
ClsiStateManager = require("./ClsiStateManager") ClsiStateManager = require("./ClsiStateManager")
_ = require("underscore") _ = require("underscore")
async = require("async") async = require("async")

2
services/web/app/coffee/Features/Compile/CompileController.coffee
View file

@ -9,7 +9,7 @@ Settings = require "settings-sharelatex"
AuthenticationController = require "../Authentication/AuthenticationController" AuthenticationController = require "../Authentication/AuthenticationController"
UserGetter = require "../User/UserGetter" UserGetter = require "../User/UserGetter"
RateLimiter = require("../../infrastructure/RateLimiter") RateLimiter = require("../../infrastructure/RateLimiter")
ClsiCookieManager = require("./ClsiCookieManager")() ClsiCookieManager = require("./ClsiCookieManager")(Settings.apis.clsi?.backendGroupName)
Path = require("path") Path = require("path")
module.exports = CompileController = module.exports = CompileController =

2
services/web/app/coffee/router.coffee
View file

@ -22,7 +22,7 @@ UserPagesController = require('./Features/User/UserPagesController')
DocumentController = require('./Features/Documents/DocumentController') DocumentController = require('./Features/Documents/DocumentController')
CompileManager = require("./Features/Compile/CompileManager") CompileManager = require("./Features/Compile/CompileManager")
CompileController = require("./Features/Compile/CompileController") CompileController = require("./Features/Compile/CompileController")
ClsiCookieManager = require("./Features/Compile/ClsiCookieManager")() ClsiCookieManager = require("./Features/Compile/ClsiCookieManager")(Settings.apis.clsi?.backendGroupName)
HealthCheckController = require("./Features/HealthCheck/HealthCheckController") HealthCheckController = require("./Features/HealthCheck/HealthCheckController")
ProjectDownloadsController = require "./Features/Downloads/ProjectDownloadsController" ProjectDownloadsController = require "./Features/Downloads/ProjectDownloadsController"
FileStoreController = require("./Features/FileStore/FileStoreController") FileStoreController = require("./Features/FileStore/FileStoreController")

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

@ -135,6 +135,7 @@ module.exports = settings =
url: "http://#{process.env['FILESTORE_HOST'] or 'localhost'}:3009" url: "http://#{process.env['FILESTORE_HOST'] or 'localhost'}:3009"
clsi: clsi:
url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013" url: "http://#{process.env['CLSI_HOST'] or 'localhost'}:3013"
backendGroupName: undefined
templates: templates:
url: "http://#{process.env['TEMPLATES_HOST'] or 'localhost'}:3007" url: "http://#{process.env['TEMPLATES_HOST'] or 'localhost'}:3007"
githubSync: githubSync: