diff --git a/README.md b/README.md index b06f6c5..8cff0b1 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.28~ynh2 +**Shipped version:** 6.30~ynh1 **Demo:** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h diff --git a/README_fr.md b/README_fr.md index 17f5049..cf3c40a 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.28~ynh2 +**Version incluse :** 6.30~ynh1 **Démo :** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h diff --git a/check_process b/check_process index fa41140..275243d 100644 --- a/check_process +++ b/check_process @@ -44,6 +44,8 @@ upgrade=1 from_commit=1ed17a307bd6a2374a21d3488f17a099107d3984 # 6.28~ynh1 upgrade=1 from_commit=2c93251155dd3ce73bfa03090e914d407cc89d30 + # 6.28~ynh2 + upgrade=1 from_commit=4bece11c12b5691811e8abb5478093cd932cad94 backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/conf/amd64.src b/conf/amd64.src index fcc77dc..d533168 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/wekan/wekan/releases/download/v6.28/wekan-6.28-amd64.zip -SOURCE_SUM=d944772ac4a89ff99df2ca1bbe5361ff74118567ad795c1e5f1085924310efcc +SOURCE_URL=https://github.com/wekan/wekan/releases/download/v6.30/wekan-6.30-amd64.zip +SOURCE_SUM=2641b9b2daa29f6a7f79f45c65206c871a20947b37276886b6488773e48eaf6f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 1957986..95d2cf1 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/wekan/wekan/releases/download/v6.28/wekan-6.28-arm64.zip -SOURCE_SUM=6de80fe2a20e2240a4e0b760a6bba46dc37765bc2eccbacd6c10657b9d441876 +SOURCE_URL=https://github.com/wekan/wekan/releases/download/v6.30/wekan-6.30-arm64.zip +SOURCE_SUM=ae0049a192976ad49d31e8e064c028f0c7c4422764ed7b2f9952ddb52a34ed9d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2ef9653..520bcf7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" }, - "version": "6.28~ynh2", + "version": "6.30~ynh1", "url": "https://wekan.github.io", "upstream": { "license": "MIT", diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2 index 879c9c1..c2ad66a 100644 --- a/scripts/ynh_mongo_db__2 +++ b/scripts/ynh_mongo_db__2 @@ -1,10 +1,9 @@ #!/bin/bash -MONGO_CE_SERVICENAME="mongod" -MONGO_CE_DEPENDENCIES="mongodb-org mongodb-org-server mongodb-org-tools mongodb-mongosh" -MONGO_CE_CONFIG="/etc/mongod.conf" -MONGO_CE_REPO="deb http://repo.mongodb.org/apt/debian buster/mongodb-org/5.0 main" -MONGO_CE_KEY="https://www.mongodb.org/static/pgp/server-5.0.asc" +readonly YNH_DEFAULT_MONGO_VERSION=4.4 +# Declare the actual MongoDB version to use: 4.4 ; 5.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} # Execute a mongo command # @@ -300,21 +299,33 @@ ynh_mongo_remove_db() { # Install MongoDB and integrate MongoDB service in YunoHost # -# usage: ynh_install_mongo +# usage: ynh_install_mongo [--mongo_version=mongo_version] +# | arg: -m, --mongo_version= - Version of MongoDB to install # # ynh_install_mongo() { + # Declare an array to define the options of this helper. + local legacy_args=m + local -A args_array=([m]=mongo_version=) + local mongo_version + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + mongo_version="${mongo_version:-$YNH_MONGO_VERSION}" + 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 - + 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" + 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 yunohost service add $mongodb_servicename --description="MongoDB daemon" --log="/var/log/mongodb/$mongodb_servicename.log" + + # Store mongo_version into the config of this app + ynh_app_setting_set --app=$app --key=mongo_version --value=$mongo_version } # Remove MongoDB @@ -329,7 +340,7 @@ ynh_remove_mongo() { if ! ynh_package_is_installed --package="mongodb*" then ynh_print_info --message="Removing MongoDB service..." - mongodb_servicename=$MONGO_CE_SERVICENAME + mongodb_servicename=mongod # Remove the mongodb service yunohost service remove $mongodb_servicename ynh_secure_remove --file="/var/lib/mongodb"