From d334dc4c0f5a99abcfa6831d68d6eb8803abfe5d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 25 Jul 2022 23:35:39 +0200 Subject: [PATCH 1/2] Better mongodb version management --- check_process | 10 ++++++---- manifest.json | 2 +- scripts/restore | 3 ++- scripts/upgrade | 9 ++++++++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/check_process b/check_process index 275243d..1bb73d8 100644 --- a/check_process +++ b/check_process @@ -38,14 +38,16 @@ #upgrade=1 from_commit=9a686b180d38329a5b53dcc40c0501961a0144b5 # 6.26~ynh1 upgrade=1 from_commit=20ccbbbd80021d71692291bfc8de6d03d32f7a76 - # 6.27.1~ynh1 + # 6.27.1~ynh1 / Mongo 4.4 upgrade=1 from_commit=9cac9713c99aabae61074ebdb2b88b1e927a1f1b - # 6.27.1~ynh2 + # 6.27.1~ynh2 / Mongo 5.0 upgrade=1 from_commit=1ed17a307bd6a2374a21d3488f17a099107d3984 - # 6.28~ynh1 + # 6.28~ynh1 / Mongo 5.0 upgrade=1 from_commit=2c93251155dd3ce73bfa03090e914d407cc89d30 - # 6.28~ynh2 + # 6.28~ynh2 / Mongo 5.0 upgrade=1 from_commit=4bece11c12b5691811e8abb5478093cd932cad94 + # 6.30~ynh1 / Mongo 4.4 ; 5.0 + upgrade=1 from_commit=19d250f0c09d4f8dad4343a86a5d20672853221a backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/manifest.json b/manifest.json index 520bcf7..37f6b82 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" }, - "version": "6.30~ynh1", + "version": "6.30~ynh2", "url": "https://wekan.github.io", "upstream": { "license": "MIT", diff --git a/scripts/restore b/scripts/restore index c5ca449..3f39656 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,6 +33,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name +mongo_version=$(ynh_app_setting_get --app=$app --key=mongo_version) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -74,7 +75,7 @@ ynh_script_progression --message="Reinstalling dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs -ynh_install_mongo +ynh_install_mongo --mongo_version=$mongo_version #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index d64cd67..add98db 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) port=$(ynh_app_setting_get --app=$app --key=port) +mongo_version=$(ynh_app_setting_get --app=$app --key=mongo_version) #================================================= # CHECK VERSION @@ -71,6 +72,12 @@ if ! ynh_permission_exists --permission="admin"; then ynh_permission_create --permission="admin" --allowed=$admin fi +# If mongo_version doesn't exist, create it +if [ -z "$mongo_version" ]; then + mongo_version="$(mongod --version | grep -oP 'db version v\K.{0,3}')" + ynh_app_setting_set --app=$app --key=mongo_version --value=$mongo_version +fi + ynh_secure_remove --file="/etc/apt/sources.list.d/mongodb-org-3.2.list" ynh_secure_remove --file="/etc/apt/sources.list.d/mongodb-org-4.4.list" @@ -106,7 +113,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs -ynh_install_mongo +ynh_install_mongo --mongo_version=$mongo_version #================================================= # NGINX CONFIGURATION From ea063296fc75fd1af5e71a4f72ac412335d8f146 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 25 Jul 2022 21:35:43 +0000 Subject: [PATCH 2/2] 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 8cff0b1..e1aabf2 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in WeKan ® is an completely Open Source and Free software collaborative kanban board application with MIT license. -**Shipped version:** 6.30~ynh1 +**Shipped version:** 6.30~ynh2 **Demo:** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h diff --git a/README_fr.md b/README_fr.md index cf3c40a..2dc41dd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour WeKan ® est une application de tableau kanban collaborative entièrement libre et open source avec une licence MIT. -**Version incluse :** 6.30~ynh1 +**Version incluse :** 6.30~ynh2 **Démo :** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h