Commit 21f24615 authored by Shane Kilkelly's avatar Shane Kilkelly
Browse files

Merge branch 'master' of github.com:sharelatex/sharelatex-docker-image

parents 1e976360 8c08df27

nginx/sharelatex.conf

+0 −1
Original line number Diff line number Diff line
@@ -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;

settings.coffee

+12 −5
Original line number Diff line number Diff line
@@ -148,6 +148,11 @@ settings = 


	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

	# ---------------------

	#
@@ -340,9 +345,6 @@ if process.env["SHARELATEX_HEADER_EXTRAS"]? 
		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

# -------------
@@ -384,6 +386,11 @@ if process.env["SHARELATEX_EMAIL_FROM_ADDRESS"]? 
			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

# -----------

# 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 =

		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}