From 5d9cf5a4ee216b3e4365c28df909d6f1d88548b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 16 Jul 2023 10:00:44 +0200 Subject: [PATCH 1/9] trying to install alternative mongo 4.4 --- scripts/_common.sh | 2 +- scripts/ynh_mongo_db__2 | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 454c6ec..b493918 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= java_version=17 -mongo_version=6.0 +mongo_version=4.4 # Java dependencies used by the app will be installed through the Java helper pkg_dependencies="" diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index bc03a33..e264fb1 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -314,17 +314,19 @@ ynh_install_mongo() { ynh_print_info --message="Installing MongoDB Community Edition ..." local mongo_debian_release=$(ynh_get_debian_release) + local mongo_packages="mongodb-org mongodb-org-server mongodb-org-tools 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" fi - if [[ "$mongo_version" == "4.4" && "$mongo_debian_release" != "buster" ]]; then - ynh_print_warn --message="Keeping $mongo_debian_release install for Mongo 4.4 to see if that works." + if [[ "$mongo_version" == "4.4" ]]; then + ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works." #mongo_debian_release=buster + mongo_packages="mongodb-mongosh-shared-openssl3" 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=$mongo_packages --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" mongodb_servicename=mongod # Make sure MongoDB is started and enabled From e587a0d9ef3cf5f06375ef700dec7023c2e7106a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 16 Jul 2023 10:01:36 +0200 Subject: [PATCH 2/9] no need to install java certificates --- scripts/ynh_install_java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_install_java b/scripts/ynh_install_java index 2e16f24..42002d4 100644 --- a/scripts/ynh_install_java +++ b/scripts/ynh_install_java @@ -104,7 +104,7 @@ ynh_install_java() { package_name=${package_name}-${java_engine} fi - ynh_install_app_dependencies ca-certificates-java ${package_name} + ynh_install_app_dependencies ${package_name} # Store java_version into the config of this app ynh_app_setting_set --app=$app --key=java_version --value=$java_version From c6eaabe9a91a16958a4818dab284efc189020e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 16 Jul 2023 10:12:37 +0200 Subject: [PATCH 3/9] alternate openssl11 --- scripts/ynh_mongo_db__2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index e264fb1..bef021f 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -323,7 +323,7 @@ ynh_install_mongo() { if [[ "$mongo_version" == "4.4" ]]; then ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works." #mongo_debian_release=buster - mongo_packages="mongodb-mongosh-shared-openssl3" + mongo_packages="mongodb-mongosh-shared-openssl11" fi ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package=$mongo_packages --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" From 50dfdf37e2a9c216967c7782451c93e8f4668544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 16 Jul 2023 11:19:24 +0200 Subject: [PATCH 4/9] alternate complete install --- scripts/ynh_mongo_db__2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index bef021f..e2d40bb 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -314,7 +314,7 @@ ynh_install_mongo() { ynh_print_info --message="Installing MongoDB Community Edition ..." local mongo_debian_release=$(ynh_get_debian_release) - local mongo_packages="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" + local mongo_packages="mongodb-org" 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)." @@ -323,7 +323,7 @@ ynh_install_mongo() { if [[ "$mongo_version" == "4.4" ]]; then ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works." #mongo_debian_release=buster - mongo_packages="mongodb-mongosh-shared-openssl11" + mongo_packages="mongodb-org-server mongodb-org-tools mongodb-mongosh-shared-openssl11" fi ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package=$mongo_packages --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" From c49ccfb661ae32c472d70e566a58620128bf1a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Sun, 16 Jul 2023 12:04:13 +0200 Subject: [PATCH 5/9] script stuff --- scripts/ynh_mongo_db__2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index e2d40bb..e86fb4b 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -326,7 +326,7 @@ ynh_install_mongo() { mongo_packages="mongodb-org-server mongodb-org-tools mongodb-mongosh-shared-openssl11" fi - ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package=$mongo_packages --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="$mongo_packages" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" mongodb_servicename=mongod # Make sure MongoDB is started and enabled From 150dcf7127d9b908e5eef28d04ddb030c3cd2931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Tue, 18 Jul 2023 08:37:36 +0200 Subject: [PATCH 6/9] Correct install mongo --- scripts/ynh_mongo_db__2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index e86fb4b..af675f4 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -314,7 +314,7 @@ ynh_install_mongo() { ynh_print_info --message="Installing MongoDB Community Edition ..." local mongo_debian_release=$(ynh_get_debian_release) - local mongo_packages="mongodb-org" + local mongo_packages="mongodb-org-server mongodb-database-tools mongodb-org-shell" 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)." @@ -322,8 +322,8 @@ ynh_install_mongo() { fi if [[ "$mongo_version" == "4.4" ]]; then ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works." - #mongo_debian_release=buster - mongo_packages="mongodb-org-server mongodb-org-tools mongodb-mongosh-shared-openssl11" + mongo_debian_release=buster + mongo_packages="mongodb-org-server mongodb-database-tools mongodb-mongosh-shared-openssl11" fi ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="$mongo_packages" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc" From daf5fa6b8546acbc2a106a06414cd8ead4a0d98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Thu, 20 Jul 2023 08:06:38 +0200 Subject: [PATCH 7/9] Fixed mongo install on ci-server --- manifest.json | 2 +- scripts/ynh_mongo_db__2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index cf812d0..e5cc9e0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Install services and databases needed to support Dont-code platform", "fr": "Installe les services et base de données nécessaires pour utiliser la plateforme Dont-code" }, - "version": "0.2~ynh4", + "version": "0.2~ynh5", "url": "https://dont-code.net", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index af675f4..cb7317b 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -321,7 +321,7 @@ ynh_install_mongo() { mongo_version="4.4" fi if [[ "$mongo_version" == "4.4" ]]; then - ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works." + ynh_print_warn --message="Switching to buster package install for Mongo 4.4." mongo_debian_release=buster mongo_packages="mongodb-org-server mongodb-database-tools mongodb-mongosh-shared-openssl11" fi From 718245251df4dd54d841794283d84523ae0b88f0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Jul 2023 06:06:43 +0000 Subject: [PATCH 8/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36eaf4d..99ff060 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Shipped version:** 0.2~ynh4 +**Shipped version:** 0.2~ynh5 **Demo:** https://dont-code.net/apps.html diff --git a/README_fr.md b/README_fr.md index 0aa8e8c..885114d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,7 @@ This Yunohost app installs the server part (services + mongo database) needed to - As well any documents or images uploaded by users will be backed up -**Version incluse :** 0.2~ynh4 +**Version incluse :** 0.2~ynh5 **Démo :** https://dont-code.net/apps.html From 3b4aadbc75eb41cb97362f8f0fd0f00876fd7ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Collin?= Date: Thu, 20 Jul 2023 08:07:52 +0200 Subject: [PATCH 9/9] Back to requesting mongo 6 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b493918..454c6ec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= java_version=17 -mongo_version=4.4 +mongo_version=6.0 # Java dependencies used by the app will be installed through the Java helper pkg_dependencies=""