|
@@ -426,9 +426,6 @@ if process.env["SHARELATEX_RIGHT_FOOTER"]?
|
|
|
if process.env["SHARELATEX_HEADER_IMAGE_URL"]?
|
|
if process.env["SHARELATEX_HEADER_IMAGE_URL"]?
|
|
|
settings.nav.custom_logo = process.env["SHARELATEX_HEADER_IMAGE_URL"]
|
|
settings.nav.custom_logo = process.env["SHARELATEX_HEADER_IMAGE_URL"]
|
|
|
|
|
|
|
|
-settings.nav.custom_logo = "http://www.bbc.co.uk/news/special/2015/newsspec_10857/bbc_news_logo.png"
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if process.env["SHARELATEX_HEADER"]?
|
|
if process.env["SHARELATEX_HEADER"]?
|
|
|
settings.nav.header = process.env["SHARELATEX_HEADER"]
|
|
settings.nav.header = process.env["SHARELATEX_HEADER"]
|
|
|
|
|
|
|
@@ -510,7 +507,7 @@ if process.env["SHARELATEX_LDAP_HOST"]
|
|
|
ca = JSON.parse(process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"])
|
|
ca = JSON.parse(process.env["SHARELATEX_LDAP_TLS_OPTS_CA_PATH"])
|
|
|
catch e
|
|
catch e
|
|
|
console.error "could not parse SHARELATEX_LDAP_TLS_OPTS_CA_PATH, invalid JSON"
|
|
console.error "could not parse SHARELATEX_LDAP_TLS_OPTS_CA_PATH, invalid JSON"
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if typeof(ca) == 'string'
|
|
if typeof(ca) == 'string'
|
|
|
ca_paths = [ca]
|
|
ca_paths = [ca]
|
|
|
else if typeof(ca) == 'object' && ca.length?
|
|
else if typeof(ca) == 'object' && ca.length?
|
Henry Oswald