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 branch 'master' of github.com:sharelatex/sharelatex-docker-image

Browse source
This commit is contained in:
Shane Kilkelly 2017-01-12 13:51:39 +00:00
commit 164d341ac6
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server-ce/nginx/sharelatex.conf
View file

@ -10,7 +10,6 @@ server {
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 3m; proxy_read_timeout 3m;
proxy_send_timeout 3m; proxy_send_timeout 3m;

15
server-ce/settings.coffee
View file

@ -148,6 +148,11 @@ settings =
behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false
i18n:
subdomainLang:
www: {lngCode:process.env["SHARELATEX_SITE_LANGUAGE"] or "en", url: siteUrl}
defaultLng: process.env["SHARELATEX_SITE_LANGUAGE"] or "en"
# Spell Check Languages # Spell Check Languages
# --------------------- # ---------------------
# #
@ -340,9 +345,6 @@ if process.env["SHARELATEX_HEADER_EXTRAS"]?
console.error("could not parse SHARELATEX_HEADER_EXTRAS, not valid JSON") console.error("could not parse SHARELATEX_HEADER_EXTRAS, not valid JSON")
# if process.env["SHARELATEX_PROXY_LEARN"]?
# settings.nav.header.push({text: "help", class: "subdued", dropdown: [{text: "documentation", url: "/learn"}] })
# Sending Email # Sending Email
# ------------- # -------------
@ -384,6 +386,11 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]?
rejectUnauthorized: parse(process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]) rejectUnauthorized: parse(process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"])
# i18n
if process.env["SHARELATEX_LANG_DOMAIN_MAPPING"]?
settings.i18n.subdomainLang = parse(process.env["SHARELATEX_LANG_DOMAIN_MAPPING"])
# Password Settings # Password Settings
# ----------- # -----------
# These restrict the passwords users can use when registering # These restrict the passwords users can use when registering
@ -392,7 +399,7 @@ if process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or process.env["SHARELA
settings.passwordStrengthOptions = settings.passwordStrengthOptions =
pattern: process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or "aA$3" pattern: process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or "aA$3"
length: {min:process.env["SHARELATEX_PASSWORD_VALIDATION_MIN_LENGTH"] or 8, max: process.env["SHARELATEX_PASSWORD_VALIDATION_MAX_LENGTH"] or 50} length: {min:process.env["SHARELATEX_PASSWORD_VALIDATION_MIN_LENGTH"] or 8, max: process.env["SHARELATEX_PASSWORD_VALIDATION_MAX_LENGTH"] or 150}