mirror of
https://github.com/overleaf/overleaf.git
synced 2025-04-05 02:46:55 +00:00
Merge pull request #4297 from overleaf/jpa-prepare-separate-defaults-per-env
[config] prepare separate overrides per env GitOrigin-RevId: fc000c023e7cc8383075c633c2882ab8e6b36c4b
This commit is contained in:
parent
fa39ef7fe5
commit
611019d718
2 changed files with 6 additions and 2 deletions
2
services/web/.gitignore
vendored
2
services/web/.gitignore
vendored
|
@ -63,6 +63,8 @@ config/*.coffee
|
|||
config/*.js
|
||||
!config/settings.defaults.js
|
||||
!config/settings.webpack.js
|
||||
!config/settings.overrides.saas.js
|
||||
!config/settings.overrides.server-pro.js
|
||||
|
||||
modules/**/Makefile
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
const base = require('../../../config/settings.overrides.saas')
|
||||
|
||||
let features
|
||||
const v1Api = {
|
||||
url: 'http://localhost:5000',
|
||||
|
@ -10,7 +12,7 @@ const httpAuthPass = 'password'
|
|||
const httpAuthUsers = {}
|
||||
httpAuthUsers[httpAuthUser] = httpAuthPass
|
||||
|
||||
module.exports = {
|
||||
module.exports = base.mergeWith({
|
||||
cacheStaticAssets: true,
|
||||
enableSubscriptions: true,
|
||||
|
||||
|
@ -234,4 +236,4 @@ module.exports = {
|
|||
test: {
|
||||
counterInit: 0,
|
||||
},
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue