Merge pull request #165 from YunoHost-Apps/testing

Testing

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Rocket.Chat for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/rocketchat.svg)](https://dash.yunohost.org/appci/app/rocketchat) ![Working status](https://ci-apps.yunohost.org/ci/badges/rocketchat.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/rocketchat.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/rocketchat.svg)](https://dash.yunohost.org/appci/app/rocketchat) ![Working status](https://ci-apps.yunohost.org/ci/badges/rocketchat.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/rocketchat.maintain.svg)
 [![Install Rocket.Chat with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rocketchat)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -26,7 +26,7 @@ Rocket.Chat is an open-source fully customizable communications platform develop
 - Mobile Apps for [iOS](https://apps.apple.com/app/rocket-chat/id1148741252) and [Android](https://play.google.com/store/apps/details?id=chat.rocket.android)
 - Desktop Apps for [macOS](https://apps.apple.com/br/app/rocket-chat/id1086818840), [Linux](https://snapcraft.io/rocketchat-desktop) and [Windows](https://releases.rocket.chat/desktop/latest/download)
 
-**Shipped version:** 5.4.1~ynh1
+**Shipped version:** 5.4.2~ynh1
 
 **Demo:** https://cloud.rocket.chat/trial
 

README_fr.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Rocket.Chat pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/rocketchat.svg)](https://dash.yunohost.org/appci/app/rocketchat) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/rocketchat.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/rocketchat.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/rocketchat.svg)](https://dash.yunohost.org/appci/app/rocketchat) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/rocketchat.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/rocketchat.maintain.svg)
 [![Installer Rocket.Chat avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rocketchat)
 
 *[Read this readme in english.](./README.md)*
@@ -26,7 +26,7 @@ Rocket.Chat est une plate-forme de communication open source entièrement person
 - Applications mobiles pour [iOS](https://apps.apple.com/app/rocket-chat/id1148741252) et [Android](https://play.google.com/store/apps/details?id=chat.rocket.android)
 - Applications de bureau pour [macOS](https://apps.apple.com/br/app/rocket-chat/id1086818840), [Linux](https://snapcraft.io/rocketchat-desktop) et [Windows](https://releases.rocket.chat/desktop/latest/download)
 
-**Version incluse :** 5.4.1~ynh1
+**Version incluse :** 5.4.2~ynh1
 
 **Démo :** https://cloud.rocket.chat/trial
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.rocket.chat/5.4.1/download
+SOURCE_URL=https://releases.rocket.chat/5.4.2/download
-SOURCE_SUM=59642645cfcd41f471a4767eda4c04b360b6e41ddc316f9a7e675b7e1444ff79
+SOURCE_SUM=438ec6b3e0ed2ff0b83b389ba2fd6f552388117095ecf2cdaef31c1818b710cc
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,7 +6,7 @@
         "en": "Team collaboration communication platform",
         "fr": "Plateforme de communication collaborative en équipe"
     },
-    "version": "5.4.1~ynh1",
+    "version": "5.4.2~ynh1",
     "url": "https://rocket.chat",
     "upstream": {
         "license": "GPL-3.0",

scripts/_common.sh

@@ -20,7 +20,7 @@ pkg_dependencies="apt-transport-https build-essential gzip curl fontconfig graph
 #=================================================
 
 readonly YNH_DEFAULT_MONGO_VERSION=4.4
-# Declare the actual MongoDB version to use: 4.4 ; 5.0
+# Declare the actual MongoDB version to use: 4.4 ; 5.0 ; 6.0
 # A packager willing to use another version of MongoDB can override the variable into its _common.sh.
 YNH_MONGO_VERSION=${YNH_MONGO_VERSION:-$YNH_DEFAULT_MONGO_VERSION}
 
@@ -66,7 +66,7 @@ ynh_mongo_exec() {
     if [ -n "$user" ]
     then
         user="--username=$user"
-        
+
         # If password is provided
         if [ -n "$password" ]
         then
@@ -121,7 +121,7 @@ EOF
         else
             database=""
         fi
-        
+
         mongosh --quiet $database --username $user --password $password --authenticationDatabase $authenticationdatabase --host $host --port $port --eval="$command"
     fi
 }
@@ -190,7 +190,7 @@ ynh_mongo_create_user() {
 
     # Create the user and set the user as admin of the db
     ynh_mongo_exec --database="$db_name" --command='db.createUser( { user: "'${db_user}'", pwd: "'${db_pwd}'", roles: [ { role: "readWrite", db: "'${db_name}'" } ] } );'
-    
+
     # Add clustermonitoring rights
     ynh_mongo_exec --database="$db_name" --command='db.grantRolesToUser("'${db_user}'",[{ role: "clusterMonitor", db: "admin" }]);'
 }
@@ -282,12 +282,12 @@ ynh_mongo_setup_db() {
     local new_db_pwd=$(ynh_string_random) # Generate a random password
     # If $db_pwd is not provided, use new_db_pwd instead for db_pwd
     db_pwd="${db_pwd:-$new_db_pwd}"
-    
+
     # Create the user and grant access to the database
     ynh_mongo_create_user --db_user="$db_user" --db_pwd="$db_pwd" --db_name="$db_name"
 
     # Store the password in the app's config
-    ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd 
+    ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 }
 
 # Remove a database if it exists, and the associated user
@@ -331,13 +331,25 @@ ynh_install_mongo() {
     ynh_handle_getopts_args "$@"
     mongo_version="${mongo_version:-$YNH_MONGO_VERSION}"
 
-    ynh_print_info --message="Installing MongoDB Community Edition..."
+    ynh_print_info --message="Installing MongoDB Community Edition ..."
-    ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$mongo_version main" --package="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
+    local mongo_debian_release=$(ynh_get_debian_release)
+
+    if [[ $(cat /proc/cpuinfo) != *"avx"* && "$mongo_version" != "4.4" ]]; then
+    ynh_print_warn --message="Installing Mongo 4.4 as $mongo_version is not compatible with your cpu (see https://docs.mongodb.com/manual/administration/production-notes/#x86_64)."
+    mongo_version="4.4"
+  fi
+  if [[ "$mongo_version" == "4.4" && "$mongo_debian_release" != "buster" ]]; then
+    ynh_print_warn --message="Switched to buster install as Mongo 4.4 is not compatible with $mongo_debian_release."
+    mongo_debian_release=buster
+  fi
+
+    ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"
     mongodb_servicename=mongod
 
     # Make sure MongoDB is started and enabled
     systemctl enable $mongodb_servicename --quiet
     systemctl daemon-reload --quiet
+
     ynh_systemd_action --service_name=$mongodb_servicename --action=restart --line_match="aiting for connections" --log_path="/var/log/mongodb/$mongodb_servicename.log"
 
     # Integrate MongoDB service in YunoHost