From 7ba22dbe1ecc6aab05be4d30196af2a58a96afdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 11 Jul 2021 15:55:42 +0200
Subject: [PATCH 1/2] Testing (#79)

* Update install
---
 README.md       | 4 ++--
 README_fr.md    | 4 ++--
 conf/app.src    | 6 +++---
 manifest.json   | 6 +++---
 scripts/backup  | 4 ++--
 scripts/install | 2 ++
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2fdca0b..408ea0b 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-the ultimate chat platform
+Team collaboration communication platform
 
-**Shipped version:** 3.16.0~ynh1
+**Shipped version:** 3.16.2~ynh1
 
 **Demo:** https://cloud.rocket.chat/trial
 
diff --git a/README_fr.md b/README_fr.md
index 7dcbd21..e45f0f3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,9 +11,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-the ultimate chat platform
+Plateforme de communication collaborative en équipe
 
-**Version incluse :** 3.16.0~ynh1
+**Version incluse :** 3.16.2~ynh1
 
 **Démo :** https://cloud.rocket.chat/trial
 
diff --git a/conf/app.src b/conf/app.src
index e31c739..0f346dd 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://releases.rocket.chat/3.16.0/download
-SOURCE_SUM=c77aeed2a5eda4a3e9dfde8cfb742f32138638a3a44d0e9e38005992fcadb45b
+SOURCE_URL=https://releases.rocket.chat/3.16.2/download
+SOURCE_SUM=97c0ddcdb8ceb95bf87282368d4f6193e1fa86e33a8f139593ca93521159c728
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=rocket.chat-3.16.0.tgz
+SOURCE_FILENAME=rocket.chat-3.16.2.tgz
 SOURCE_EXTRACT=true
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d246846..15a0448 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
     "id": "rocketchat",
     "packaging_format": 1,
     "description": {
-        "en": "the ultimate chat platform",
-        "fr": "the ultimate chat platform"
+        "en": "Team collaboration communication platform",
+        "fr": "Plateforme de communication collaborative en équipe"
     },
-    "version": "3.16.0~ynh1",
+    "version": "3.16.2~ynh1",
     "url": "https://rocket.chat",
     "upstream": {
         "license": "GPL-3.0",
diff --git a/scripts/backup b/scripts/backup
index 3ca4521..e0b8bd7 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -43,7 +43,7 @@ ynh_backup --src_path="$final_path"
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" "conf/nginx"
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # SPECIFIC BACKUP
@@ -51,7 +51,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" "conf/nginx"
 # BACKUP SYSTEMD
 #=================================================
 
-ynh_backup --src_path="/etc/systemd/system/$app.service" "conf/service"
+ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================
 # BACKUP THE MONGODB DATABASE
diff --git a/scripts/install b/scripts/install
index b29b14e..bad0647 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,6 +80,8 @@ db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mongo_setup_db --db_user=$db_user --db_name=$db_name
 
+#mongo < ../conf/rocketchat_ldap.js
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================

From cd803c84b12c77bb69eaa3f1ed631bfccf7b5669 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 15 Aug 2021 18:10:36 +0200
Subject: [PATCH 2/2] Fix

---
 conf/systemd.service | 2 +-
 scripts/_common.sh   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 8451839..65b2f60 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=The Rocket.Chat server
-Wants=__MONGODB_SERVICENAME__.service
+#Wants=__MONGODB_SERVICENAME__.service
 After=network.target remote-fs.target nss-lookup.target nginx.service __MONGODB_SERVICENAME__.service
 
 [Service]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 157327b..87ac1c2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -324,12 +324,11 @@ ynh_mongo_remove_db() {
 #
 #
 ynh_install_mongo() {
-    ynh_print_info --message="Installing MongoDB..."
+    ynh_script_progression --message="Installing MongoDB..."  --weight=5
 
     # Define Mongo Service Name
     if $(dpkg --compare-versions $(cat /etc/debian_version) gt "10.0")
     then
-        ynh_print_info --message="Installing MongoDB Community Edition..."
         ynh_install_extra_app_dependencies --repo="$MONGO_CE_REPO" --package="$MONGO_CE_DEPENDENCIES" --key="$MONGO_CE_KEY"
         MONGODB_SERVICENAME=$MONGO_CE_SERVICENAME
     else