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

Updated settings with several fixes (#111)

Browse source
This commit is contained in:
Miguel Serrano 2019-09-04 16:39:47 +02:00 committed by GitHub
parent a818b1d427
commit d126eb7112
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server-ce/settings.coffee
View file

@ -168,8 +168,7 @@ settings =
# between services that may need to go over public channels # between services that may need to go over public channels
httpAuthUsers: httpAuthUsers httpAuthUsers: httpAuthUsers
# Should javascript assets be served minified or not. Note that you will # Should javascript assets be served minified or not.
# need to run `make minify` within the web directory to generate these.
useMinifiedJs: true useMinifiedJs: true
# Should static assets be sent with a header to tell the browser to cache # Should static assets be sent with a header to tell the browser to cache
@ -197,6 +196,10 @@ settings =
url: "http://localhost:3000" url: "http://localhost:3000"
user: httpAuthUser user: httpAuthUser
pass: httpAuthPass pass: httpAuthPass
# overrides v1.url to indicate via Feature Flags that Overleaf V1
# is not available
v1:
url: null
references:{} references:{}
notifications:undefined notifications:undefined
@ -421,8 +424,6 @@ if process.env["SHARELATEX_SAML_ENTRYPOINT"]
entryPoint: process.env["SHARELATEX_SAML_ENTRYPOINT"] entryPoint: process.env["SHARELATEX_SAML_ENTRYPOINT"]
callbackUrl: process.env["SHARELATEX_SAML_CALLBACK_URL"] callbackUrl: process.env["SHARELATEX_SAML_CALLBACK_URL"]
issuer: process.env["SHARELATEX_SAML_ISSUER"] issuer: process.env["SHARELATEX_SAML_ISSUER"]
cert: process.env["SHARELATEX_SAML_CERT"]
privateCert: process.env["SHARELATEX_SAML_PRIVATE_CERT"]
decryptionPvk: process.env["SHARELATEX_SAML_DECRYPTION_PVK"] decryptionPvk: process.env["SHARELATEX_SAML_DECRYPTION_PVK"]
signatureAlgorithm: process.env["SHARELATEX_SAML_SIGNATURE_ALGORITHM"] signatureAlgorithm: process.env["SHARELATEX_SAML_SIGNATURE_ALGORITHM"]
identifierFormat: process.env["SHARELATEX_SAML_IDENTIFIER_FORMAT"] identifierFormat: process.env["SHARELATEX_SAML_IDENTIFIER_FORMAT"]
@ -482,6 +483,11 @@ if process.env["SHARELATEX_SAML_ENTRYPOINT"]
undefined undefined
) )
# SHARELATEX_SAML_CERT cannot be empty
# https://github.com/bergie/passport-saml/commit/f6b1c885c0717f1083c664345556b535f217c102
if process.env["SHARELATEX_SAML_CERT"]
settings.saml.server.cert = process.env["SHARELATEX_SAML_CERT"]
settings.saml.server.privateCert = process.env["SHARELATEX_SAML_PRIVATE_CERT"]
# Compiler # Compiler
# -------- # --------