From d18a63fac4ac4e36fec67701e2befd5a5aafd3b2 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 4 Jan 2017 11:41:38 +0000 Subject: [PATCH 1/3] - added option to set lang code - removed commeted out learn header code - increased max pass length to 150 --- settings.coffee | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/settings.coffee b/settings.coffee index a132c4eb99..c410305a59 100644 --- a/settings.coffee +++ b/settings.coffee @@ -148,6 +148,12 @@ settings = behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false + # Site Languages + i18n: + subdomainLang: + www: {lngCode:process.env["SHARELATEX_SITE_LANGUAGE"] or "en", url: siteUrl} + defaultLng: process.env["SHARELATEX_SITE_LANGUAGE"] or "en" + # Spell Check Languages # --------------------- # @@ -329,9 +335,6 @@ if process.env["SHARELATEX_HEADER_NAV_LINKS"]? catch e console.error("could not parse SHARELATEX_HEADER_NAV_LINKS, not valid JSON") -# if process.env["SHARELATEX_PROXY_LEARN"]? -# settings.nav.header.push({text: "help", class: "subdued", dropdown: [{text: "documentation", url: "/learn"}] }) - # Sending Email # ------------- @@ -381,7 +384,7 @@ if process.env["SHARELATEX_PASSWORD_VALIDATION_PATTERN"] or process.env["SHARELA settings.passwordStrengthOptions = 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} From 1bfec242b27e2ab691e1ac7e28fb00d755638abd Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 6 Jan 2017 11:28:32 +0000 Subject: [PATCH 2/3] add option to set lang per domain --- settings.coffee | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/settings.coffee b/settings.coffee index c410305a59..25dfe1e548 100644 --- a/settings.coffee +++ b/settings.coffee @@ -148,7 +148,6 @@ settings = behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false - # Site Languages i18n: subdomainLang: www: {lngCode:process.env["SHARELATEX_SITE_LANGUAGE"] or "en", url: siteUrl} @@ -374,7 +373,12 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]? if process.env["SHARELATEX_EMAIL_SMTP_TLS_REJECT_UNAUTH"]? settings.email.parameters.tls = 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 # ----------- From 8c08df27178a80a00fef996b6daf1947e276167f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 6 Jan 2017 16:02:27 +0000 Subject: [PATCH 3/3] remove proxy_set_header X-Forwarded-Proto $scheme for https --- nginx/sharelatex.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/nginx/sharelatex.conf b/nginx/sharelatex.conf index 0111797967..cf63f4c5c4 100644 --- a/nginx/sharelatex.conf +++ b/nginx/sharelatex.conf @@ -10,7 +10,6 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; 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_read_timeout 3m; proxy_send_timeout 3m;