From 38c8eb868ae12f7333ad36b5acb06e579079480c Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 6 Apr 2016 11:30:26 -0300 Subject: [PATCH 1/2] Update package.json --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 1104db5b0d..a2940f911f 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -27,7 +27,7 @@ "heapdump": "^0.3.7", "http-proxy": "^1.8.1", "jade": "~1.3.1", - "ldapjs": "^0.7.1", + "ldapjs": "^1.0.0", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.1", "lynx": "0.1.1", "marked": "^0.3.3", From ae79ce75b748f1a53928cd33226d84a60eb07c1a Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 6 Apr 2016 11:32:08 -0300 Subject: [PATCH 2/2] Update settings.defaults.coffee --- services/web/config/settings.defaults.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 0b3ee90e96..2c16d41a52 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -393,6 +393,10 @@ module.exports = # anonymous: false # adminDN: 'cn=read-only-admin,dc=example,dc=com' # adminPW: 'password' + # starttls: true + # tlsOptions: + # rejectUnauthorized: false + # ca: '/etc/ldap/ca_certs.pem' #templateLinks: [{ # name : "CV projects",