From cd0d74e07147ae32014d49a3d55a4f5d01333d1d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 13 Jun 2022 01:35:09 +0200 Subject: [PATCH 1/4] ynh_mongo_db__2 --- scripts/backup | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- scripts/{ynh_mongo_db => ynh_mongo_db__2} | 45 +++++++---------------- 6 files changed, 18 insertions(+), 37 deletions(-) rename scripts/{ynh_mongo_db => ynh_mongo_db__2} (84%) diff --git a/scripts/backup b/scripts/backup index 09fc3d1..821ad88 100644 --- a/scripts/backup +++ b/scripts/backup @@ -8,7 +8,7 @@ # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/ynh_mongo_db +source ../settings/scripts/ynh_mongo_db__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 3e2f01d..de6d01b 100644 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,7 @@ #================================================= source _common.sh -source ynh_mongo_db +source ynh_mongo_db__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index 3e232b9..0a3323a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,7 @@ #================================================= source _common.sh -source ynh_mongo_db +source ynh_mongo_db__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index f10a08a..c5ca449 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,7 @@ # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/ynh_mongo_db +source ../settings/scripts/ynh_mongo_db__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7147009..e240fa9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,7 @@ #================================================= source _common.sh -source ynh_mongo_db +source ynh_mongo_db__2 source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/ynh_mongo_db b/scripts/ynh_mongo_db__2 similarity index 84% rename from scripts/ynh_mongo_db rename to scripts/ynh_mongo_db__2 index cca1338..44b7bb6 100644 --- a/scripts/ynh_mongo_db +++ b/scripts/ynh_mongo_db__2 @@ -1,13 +1,10 @@ #!/bin/bash -MONGO_DEBIAN_SERVICENAME="mongodb" MONGO_CE_SERVICENAME="mongod" -MONGO_DEBIAN_DEPENDENCIES="mongodb mongodb-server mongo-tools" -MONGO_CE_DEPENDENCIES="mongodb-org mongodb-org-server mongodb-org-tools" -MONGO_DEBIAN_CONFIG="/etc/mongodb.conf" +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/4.4 main" -MONGO_CE_KEY="https://www.mongodb.org/static/pgp/server-4.4.asc" +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" # Execute a mongo command # @@ -93,7 +90,7 @@ ynh_mongo_exec() { database="" fi - mongo --quiet $user $password $authenticationdatabase $host $port < Date: Mon, 13 Jun 2022 01:36:11 +0200 Subject: [PATCH 2/4] Update check_process --- check_process | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index dd94157..7d9edf6 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,8 @@ upgrade=1 from_commit=2e9c8be6b87d5c4cd6693e7b3c0c05cfc7d1ac51 # 5.93~ynh1 upgrade=1 from_commit=493a70f7d0e79b3ee92d53976a0cd35fa944b428 + # 6.27~ynh1 + upgrade=1 from_commit=b74bbb4b5c8e67753672ecb69501c4a41771d852 backup_restore=1 multi_instance=1 port_already_use=0 @@ -23,8 +25,3 @@ ;;; Options Email=ljf+ynh-wekan@reflexlibre.net Notification=down -;;; Upgrade options - ; commit=2e9c8be6b87d5c4cd6693e7b3c0c05cfc7d1ac51 - name=5.35~ynh1 - ; commit=493a70f7d0e79b3ee92d53976a0cd35fa944b428 - name=5.93~ynh1 From fd9974e5c0e2f8b7c37ccb4ef6e5fd7b4105fb98 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 18 Jun 2022 01:14:21 +0200 Subject: [PATCH 3/4] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d9e7528..eafb124 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" }, - "version": "6.27.1~ynh1", + "version": "6.27.1~ynh2", "url": "https://wekan.github.io", "upstream": { "license": "MIT", From a747f1401cbdad2f3d94ec2bdddb83b33a0789b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Jun 2022 23:14:25 +0000 Subject: [PATCH 4/4] 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 714358b..39d884c 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.27.1~ynh1 +**Shipped version:** 6.27.1~ynh2 **Demo:** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h diff --git a/README_fr.md b/README_fr.md index 8c7c348..19624f9 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 ® is an completely Open Source and Free software collaborative kanban board application with MIT license. -**Version incluse :** 6.27.1~ynh1 +**Version incluse :** 6.27.1~ynh2 **Démo :** https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h