From b1112935faa22bb2679d963d20f1d9218bc76600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 May 2024 08:19:50 +0200
Subject: [PATCH 1/4] Update manifest.toml

---
 manifest.toml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index c3ecdd2..7192848 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -4,7 +4,8 @@ packaging_format = 2
 
 id = "fab-manager"
 name = "Fab-manager"
-description.en = "Fab Lab management solution."
+description.en = "Fab Lab management solution"
+description.fr = "Solution de gestion de Fab Lab"
 
 version = "5.6.5~ynh2"
 
@@ -23,9 +24,9 @@ architectures = "all"
 multi_instance = false
 ldap = false
 sso = false
-disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
-ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
 
 [install]
     [install.domain]

From 888e007625865e61e75cc6fe2063c9f95cd5e7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 May 2024 08:21:23 +0200
Subject: [PATCH 2/4] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index f1a485c..7f146be 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,11 +65,11 @@ chown -R "$app:www-data" "$install_dir"
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/secrets.yml" --destination="$install_dir/config/secrets.yml"
+ynh_add_config --template="secrets.yml" --destination="$install_dir/config/secrets.yml"
 chmod 400 "$install_dir/config/secrets.yml"
 chown "$app:$app" "$install_dir/config/secrets.yml"
 
-ynh_add_config --template="../conf/database.yml" --destination="$install_dir/config/database.yml"
+ynh_add_config --template="database.yml" --destination="$install_dir/config/database.yml"
 chmod 400 "$install_dir/config/database.yml"
 chown "$app:$app" "$install_dir/config/database.yml"
 

From ef33e9a70bffaff39ce45011bea844f83ab273a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 May 2024 08:23:57 +0200
Subject: [PATCH 3/4] Update remove

---
 scripts/remove | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 2f1a80f..18d79d2 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -27,13 +27,8 @@ ynh_remove_systemd_config --service="$app-worker"
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing Ruby..." --weight=1
 ynh_remove_ruby
 
-ynh_script_progression --message="Removing NodeJS..." --weight=1
 ynh_remove_nodejs
 
 #=================================================

From 61535b1bc685428b161706005e85b74e00691c8d Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Wed, 15 May 2024 13:00:41 +0200
Subject: [PATCH 4/4] Update upgrade: there's no ynh_supervisor to source x_x

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7f146be..a938691 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_supervisor
 source /usr/share/yunohost/helpers
 
 #=================================================