From 49f0ddc0c7a11e6d2615f81c19987a0de7f1bffe Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 28 Jul 2023 15:31:08 +0200 Subject: [PATCH 1/6] Update mongosh to use shared OpenSSL --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 08da309..7a90e4e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -340,7 +340,7 @@ ynh_install_mongo() { 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" + 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-shared-openssl11" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" mongodb_servicename=mongod # Make sure MongoDB is started and enabled From 0c82f3f1e734a06853cd4745813e879ed4d17864 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 28 Jul 2023 15:41:10 +0200 Subject: [PATCH 2/6] Add SHA for sources. --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 261fa78..a87c917 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,7 +52,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://releases.rocket.chat/6.2.9/download" - sha256 = "" + sha256 = "f10db86c790f26fbeb01a3aa6e5462d81cf98868896d70264258d44712a2343a" in_subdir = true extract = true rename = "rocket.chat.tgz" From f32c2a175bf87e709d55b2dd38b04b85545990b6 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 28 Jul 2023 18:32:49 +0200 Subject: [PATCH 3/6] Use yet another package for buster 4.4 --- scripts/_common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7a90e4e..7b45cc2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -330,17 +330,19 @@ ynh_install_mongo() { ynh_print_info --message="Installing MongoDB Community Edition ..." local mongo_debian_release=$(ynh_get_debian_release) + local mongosh_package="mongodb-mongosh" 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" + mongosh_package="mongosh" 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-shared-openssl11" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" + 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 $mongosh_package" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" mongodb_servicename=mongod # Make sure MongoDB is started and enabled From dc8ee92e6d2e7ef7d67bbb148e2ffef91c1a2195 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 28 Jul 2023 18:52:24 +0200 Subject: [PATCH 4/6] Don't use mongosh at all --- scripts/_common.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7b45cc2..c631506 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -105,7 +105,7 @@ ynh_mongo_exec() { database="" fi - mongosh --quiet --username $user --password $password --authenticationDatabase $authenticationdatabase --host $host --port $port < Date: Fri, 28 Jul 2023 19:42:11 +0200 Subject: [PATCH 5/6] Change mongo API --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c631506..a728eb0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -105,7 +105,7 @@ ynh_mongo_exec() { database="" fi - mongo --quiet --username $user --password $password --authenticationDatabase $authenticationdatabase --host $host --port $port < Date: Sat, 29 Jul 2023 00:31:53 +0200 Subject: [PATCH 6/6] Restore mongodb-database-tools dependency --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a728eb0..1efb27f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -340,7 +340,7 @@ ynh_install_mongo() { 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-server mongodb-org-shell" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" + ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="mongodb-org-server mongodb-org-shell mongodb-database-tools" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" mongodb_servicename=mongod # Make sure MongoDB is started and enabled