From 53285e1c618ad9c6aef71a1ac7623a712a6e9ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@plopoyop.me>
Date: Mon, 30 Apr 2018 12:58:57 +0200
Subject: [PATCH 1/3] fix ldap settings

---
 conf/rocketchat_ldap.js | 50 +++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/conf/rocketchat_ldap.js b/conf/rocketchat_ldap.js
index 476de99..23de9a0 100644
--- a/conf/rocketchat_ldap.js
+++ b/conf/rocketchat_ldap.js
@@ -8,13 +8,43 @@ db.rocketchat_settings.update(
     }
 )
 db.rocketchat_settings.update(
-  { "_id" : "LDAP_Domain_Base" },
+  { "_id" : "LDAP_Login_Fallback" },
+    {
+      $set: { "value": false }
+    }
+)
+db.rocketchat_settings.update(
+  { "_id" : "LDAP_Host" },
+    {
+      $set: { "value": "localhost" }
+    }
+)
+db.rocketchat_settings.update(
+  { "_id" : "LDAP_Port" },
+    {
+      $set: { "value": "389" }
+    }
+)
+db.rocketchat_settings.update(
+  { "_id" : "LDAP_Reconnect" },
+    {
+      $set: { "value": true }
+    }
+)
+db.rocketchat_settings.update(
+  { "_id" : "LDAP_BaseDN" },
     {
       $set: { "value": "dc=yunohost,dc=org" }
     }
 )
 db.rocketchat_settings.update(
-  { "_id" : "LDAP_Domain_Search_User_ID" },
+  { "_id" : "LDAP_Username_Field" },
+    {
+      $set: { "value": "uid" }
+    }
+)
+db.rocketchat_settings.update(
+  { "_id" : "LDAP_Unique_Identifier_Field" },
     {
       $set: { "value": "uid" }
     }
@@ -38,22 +68,14 @@ db.rocketchat_settings.update(
     }
 )
 db.rocketchat_settings.update(
-  { "_id" : "LDAP_Host" },
+  { "_id" : "LDAP_User_Search_Filter" },
     {
-      $set: { "value": "localhost" }
+      $set: { "value": "(objectclass=inetOrgPerson)" }
     }
 )
 db.rocketchat_settings.update(
-  { "_id" : "LDAP_Domain_Search_Object_Category" },
+  { "_id" : "LDAP_User_Search_Field" },
     {
-      $set: { "value": "" }
+      $set: { "value": "uid" }
     }
 )
-db.rocketchat_settings.update(
-  { "_id" : "LDAP_Username_Field" },
-    {
-      $set: { "value": "" }
-    }
-)
-
-

From bf13d9a5318dca88a897d3136d1a53f5ce970b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@plopoyop.me>
Date: Mon, 30 Apr 2018 12:59:34 +0200
Subject: [PATCH 2/3] update to 0.64.0

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ddbf680..fe53963 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,7 +1,7 @@
 # common.sh
 
-ROCKETCHAT_VERSION=0.60.4
-ROCKETCHAT_SHASUM=6eba8f765fcbc107eccacdccb5b20fa57a9970f3743fb23de43e219a09845155
+ROCKETCHAT_VERSION=0.64.0
+ROCKETCHAT_SHASUM=06aa2c6307c784bc19885fb1e80e1eb7320601c9bc2bfbb0f48c9941d93c6030
 NODE_VERSION=8.9.4
 
 checkcmd() {

From a2ccf1fd76547b93c31bc52b75c810217bd7bc87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement@plopoyop.me>
Date: Mon, 30 Apr 2018 13:00:10 +0200
Subject: [PATCH 3/3] run npm as user

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index f2cd182..4675365 100644
--- a/scripts/install
+++ b/scripts/install
@@ -99,7 +99,7 @@ sudo chown -R $serviceuser: $final_path
 
 cd $final_path/programs/server/
 
-sudo npm install --production
+sudo -u $serviceuser npm install --production
 
 cd $workdir