From 043dab9a7abdb6a38b79a6db807bfbcb3c487b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:54:01 +0200
Subject: [PATCH 1/9] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 7ff2b0a..62d53a3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -123,7 +123,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--optimize-autoloader --no-interaction"
 ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"

From de2372bb9843422fbd96aab310a384f7dfc13dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:59:23 +0200
Subject: [PATCH 2/9] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 8403df7..83648d3 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -113,7 +113,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
+	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
+
+	ynh_secure_remove --file="$final_path/var/plugins/*"
 fi
 
 chmod 750 "$final_path"
@@ -153,7 +155,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_secure_remove --file="$final_path/var/cache/prod"
+ynh_secure_remove --file="$final_path/var/cache/prod/*"
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 

From b816199dc5e5789780eac49abc2ea887c4c4d3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:02:23 +0200
Subject: [PATCH 3/9] Update .env

---
 conf/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/.env b/conf/.env
index 68d97ba..ef481cc 100644
--- a/conf/.env
+++ b/conf/.env
@@ -19,7 +19,7 @@
 # For MariaDB it would be "serverVersion=mariadb-10.5.8":
 #    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=mariadb-10.5.8
 #
-DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=utf8&serverVersion=mariadb-10.5.12
+DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=utf8mb4&serverVersion=mariadb-10.5.19
 
 #================================================================================
 # The full documentation can be found at https://www.kimai.org/documentation/emails.html

From 2e9207c9bf5a06844f1faeb917d85a8f0f738d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:23:36 +0200
Subject: [PATCH 4/9] Update check_process

---
 check_process | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check_process b/check_process
index 12002d4..c2aad8a 100644
--- a/check_process
+++ b/check_process
@@ -1,4 +1,4 @@
-;; Test complet mysql
+;; Test complet
 	; Manifest
 		domain="domain.tld"
 		is_public=1
@@ -14,7 +14,7 @@
 		setup_public=1
 		upgrade=1
 		# 1.30.0~ynh1
-		upgrade=1	from_commit=d073ffb8db7e416f0f1d0f645c6e77a9f11e10b9
+		upgrade=1	from_commit=8f44ac8fd4276c402c3cf68e373a6a3ff51e25b5
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0

From 9deb617f13cc58b12a0f98cc478c892cbddfebb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:27:04 +0200
Subject: [PATCH 5/9] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 83648d3..a111889 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,6 +116,7 @@ then
 	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
 
 	ynh_secure_remove --file="$final_path/var/plugins/*"
+	ynh_secure_remove --file="$final_path/var/cache/prod/*"
 fi
 
 chmod 750 "$final_path"
@@ -155,7 +156,6 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_secure_remove --file="$final_path/var/cache/prod/*"
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 

From eb83b27faeaa44bf1268d09b0573658fca6d7595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:28:02 +0200
Subject: [PATCH 6/9] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index a111889..3d8973a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -154,7 +154,7 @@ ynh_add_nginx_config
 #=================================================
 # BUILD KIMAI2
 #=================================================
-ynh_script_progression --message="Building Kimai2..." --weight=1
+ynh_script_progression --message="Building $app..." --weight=1
 
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
@@ -191,7 +191,7 @@ chown $app:$app "$final_path/.env"
 #=================================================
 # INSTALL KIMAI2
 #=================================================
-ynh_script_progression --message="Installing Kimai2..." --weight=1
+ynh_script_progression --message="Installing $app..." --weight=1
 
 pushd "$final_path"
 	ynh_exec_as $app php$YNH_PHP_VERSION bin/console kimai:update -n

From eda3f0004b1fc71eb5ab39513f584f6674540f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:18:36 +0200
Subject: [PATCH 7/9] Update upgrade

---
 scripts/upgrade | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3d8973a..c1a596c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,9 +114,6 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
-
-	ynh_secure_remove --file="$final_path/var/plugins/*"
-	ynh_secure_remove --file="$final_path/var/cache/prod/*"
 fi
 
 chmod 750 "$final_path"
@@ -156,7 +153,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building $app..." --weight=1
 
-ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
+ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-interaction"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"

From aa56f4b380cadf1e3e20fef9fa83ffe8e2e14f41 Mon Sep 17 00:00:00 2001
From: eric_G <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:26:42 +0200
Subject: [PATCH 8/9] Update scripts/install

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 62d53a3..41a5c84 100755
--- a/scripts/install
+++ b/scripts/install
@@ -105,7 +105,7 @@ setfacl -R -m g:"www-data":rwX -m u:$app:rwX "$final_path/var/"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

From 030b732c8236214b56c5b287db6068ce4225aa7c Mon Sep 17 00:00:00 2001
From: eric_G <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:26:50 +0200
Subject: [PATCH 9/9] Update scripts/upgrade

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c1a596c..004dd39 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -135,7 +135,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================