From ac9fc393e2cafc63b394db11af36685d0b4b7ba5 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 19 Apr 2023 20:15:54 +0200
Subject: [PATCH 01/14] Upgrade to v6.0.0

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 60176c3..ad213a0 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "PHPBoost"
 description.en = "French and free content management system (CMS)"
 description.fr = "système de gestion de contenu (CMS) français et libre"
 
-version = "5.2.14~ynh1"
+version = "6.0.0~ynh1"
 
 maintainers = [""]
 
@@ -43,8 +43,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-5.2.14.tar.gz"
-        sha256 = "d93acd8f631f0789d6985f06a0d3bb7a5e2063bebffc1282cd55f8ff2abe0581"
+        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.0.tar.gz"
+        sha256 = "d2b307a48b42da28cefdda2000c29327a6e2d71bab81f601031ed6d96298fe51"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

From a97fd6bd0bae96a9852c4064ab4649714939471d Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 19 Apr 2023 18:15:56 +0000
Subject: [PATCH 02/14] 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 2936a38..bd2861e 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
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Shipped version:** 5.2.14~ynh1
+**Shipped version:** 6.0.0~ynh1
 
 **Demo:** https://demo.phpboost.com/
 
diff --git a/README_fr.md b/README_fr.md
index 5621af3..53c0e65 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) po
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Version incluse :** 5.2.14~ynh1
+**Version incluse :** 6.0.0~ynh1
 
 **Démo :** https://demo.phpboost.com/
 

From 0912c6be9cb5aa0b5b1b98587d68cb09ddbac3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 2 Sep 2023 21:34:42 +0200
Subject: [PATCH 03/14] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 60176c3..b094e7c 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -3,7 +3,7 @@ packaging_format = 2
 id = "phpboost"
 name = "PHPBoost"
 description.en = "French and free content management system (CMS)"
-description.fr = "système de gestion de contenu (CMS) français et libre"
+description.fr = "Système de gestion de contenu (CMS) français et libre"
 
 version = "5.2.14~ynh1"
 
@@ -17,7 +17,7 @@ admindoc = "https://www.phpboost.com/wiki/wiki.php"
 code = "https://github.com/PHPBoost/PHPBoost"
 
 [integration]
-yunohost = ">= 11.1.17"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = false

From c2c275f7506df71337d5d4d69050a1cb419d23bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 2 Sep 2023 21:35:52 +0200
Subject: [PATCH 04/14] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index b094e7c..9f5f219 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -57,7 +57,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php7.4-mysql php7.4-gd"
+    packages = "mariadb-server php8.2-mysql php8.2-gd"
 
     [resources.database]
     type = "mysql"

From 74f23404c8431b6f722fac21524ddb870eeca8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 2 Sep 2023 21:48:35 +0200
Subject: [PATCH 05/14] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index ebf6778..e9df9af 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -44,7 +44,7 @@ ram.runtime = "50M"
 
         [resources.sources.main]
         url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.0.tar.gz"
-        sha256 = "d2b307a48b42da28cefdda2000c29327a6e2d71bab81f601031ed6d96298fe51"
+        sha256 = "c54b15c4f560a57d2e5672a99fa3b22e019109f449dc4585b76f823723e9b890"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

From fd056eb604c1d6a2231001eaf99589c71340960a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 7 Sep 2023 18:57:38 +0200
Subject: [PATCH 06/14] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index e9df9af..13741da 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -57,7 +57,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-mysql php8.2-gd"
+    packages = "mariadb-server, php8.2-mysql, php8.2-gd"
 
     [resources.database]
     type = "mysql"

From 120773d922d450e92832d504b17e685cd2b1b182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 8 Sep 2023 12:23:47 +0200
Subject: [PATCH 07/14] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 13741da..9d6277b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "PHPBoost"
 description.en = "French and free content management system (CMS)"
 description.fr = "Système de gestion de contenu (CMS) français et libre"
 
-version = "6.0.0~ynh1"
+version = "6.0.1~ynh1"
 
 maintainers = [""]
 
@@ -43,8 +43,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.0.tar.gz"
-        sha256 = "c54b15c4f560a57d2e5672a99fa3b22e019109f449dc4585b76f823723e9b890"
+        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.1.tar.gz"
+        sha256 = "56825d5799c0b8254794e190147936c9878ff8338a3e543b527879b870437566"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

From b2f43de5fbca6e75f67e1f1a393fc1dc63d206dd Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 8 Sep 2023 10:23:53 +0000
Subject: [PATCH 08/14] 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 bd2861e..d0eb092 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
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Shipped version:** 6.0.0~ynh1
+**Shipped version:** 6.0.1~ynh1
 
 **Demo:** https://demo.phpboost.com/
 
diff --git a/README_fr.md b/README_fr.md
index 53c0e65..74bd5bb 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) po
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Version incluse :** 6.0.0~ynh1
+**Version incluse :** 6.0.1~ynh1
 
 **Démo :** https://demo.phpboost.com/
 

From 645284febe7c71420f1c22ab716ca404f1ecb9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 8 Sep 2023 12:26:46 +0200
Subject: [PATCH 09/14] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 9d6277b..6ebde75 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -57,7 +57,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-mysql, php8.2-gd"
+    packages = "mariadb-server, php8.0-mysql, php8.0-gd"
 
     [resources.database]
     type = "mysql"

From 0e4053cfc56c66cfe2da45de7a11a6e6b1090b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 12:08:51 +0100
Subject: [PATCH 10/14] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 6ebde75..f162050 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "PHPBoost"
 description.en = "French and free content management system (CMS)"
 description.fr = "Système de gestion de contenu (CMS) français et libre"
 
-version = "6.0.1~ynh1"
+version = "6.0.2~ynh1"
 
 maintainers = [""]
 
@@ -43,8 +43,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.1.tar.gz"
-        sha256 = "56825d5799c0b8254794e190147936c9878ff8338a3e543b527879b870437566"
+        url = "https://github.com/PHPBoost/PHPBoost/archive/refs/tags/phpboost-6.0.2.tar.gz"
+        sha256 = "83888d8cdbf5fdae54214e43eaf1badfcefabb8f117e0b394bdc5a073742379f"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

From a70271685d6b2028445ab4fc0ba803f08602cf34 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 17 Nov 2023 11:08:57 +0000
Subject: [PATCH 11/14] Auto-update README

---
 README.md    | 4 ++--
 README_fr.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d0eb092..efde3e8 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
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Shipped version:** 6.0.1~ynh1
+**Shipped version:** 6.0.2~ynh1
 
 **Demo:** https://demo.phpboost.com/
 
@@ -31,7 +31,7 @@ PHPBoost allows everyone to create his own website without any particular knowle
 * Official app website: <https://www.phpboost.com/>
 * Official admin documentation: <https://www.phpboost.com/wiki/wiki.php>
 * Upstream app code repository: <https://github.com/PHPBoost/PHPBoost>
-* YunoHost documentation for this app: <https://yunohost.org/app_phpboost>
+* YunoHost Store: <https://apps.yunohost.org/app/phpboost>
 * Report a bug: <https://github.com/YunoHost-Apps/phpboost_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index 74bd5bb..f378d6f 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) po
 
 PHPBoost allows everyone to create his own website without any particular knowledge required in webmastering.
 
-**Version incluse :** 6.0.1~ynh1
+**Version incluse :** 6.0.2~ynh1
 
 **Démo :** https://demo.phpboost.com/
 
@@ -31,7 +31,7 @@ PHPBoost allows everyone to create his own website without any particular knowle
 * Site officiel de l’app : <https://www.phpboost.com/>
 * Documentation officielle de l’admin : <https://www.phpboost.com/wiki/wiki.php>
 * Dépôt de code officiel de l’app : <https://github.com/PHPBoost/PHPBoost>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_phpboost>
+* YunoHost Store: <https://apps.yunohost.org/app/phpboost>
 * Signaler un bug : <https://github.com/YunoHost-Apps/phpboost_ynh/issues>
 
 ## Informations pour les développeurs

From 8aa2839c9b39962b48c3d21b0f623416e5e2a76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 12:11:58 +0100
Subject: [PATCH 12/14] cleaning

---
 conf/nginx.conf | 1 +
 manifest.toml   | 3 +++
 scripts/install | 7 +------
 scripts/remove  | 5 -----
 scripts/restore | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index ddf172c..02ca6a4 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -9,6 +9,7 @@ location __PATH__/ {
   index index.php;
 
   try_files $uri $uri/ index.php;
+  
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
diff --git a/manifest.toml b/manifest.toml
index f162050..f8cbfc2 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -20,8 +20,11 @@ code = "https://github.com/PHPBoost/PHPBoost"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "253M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index e026f10..6180593 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,13 +28,8 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=4
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
-
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/remove b/scripts/remove
index 79cb058..61db822 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
diff --git a/scripts/restore b/scripts/restore
index 9702650..6300c04 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,7 +36,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 

From 29d4e2e81c33addad5f1780eff1d8148a0862416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 12:12:22 +0100
Subject: [PATCH 13/14] Update manifest.toml

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index f8cbfc2..197aaf2 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -60,7 +60,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.0-mysql, php8.0-gd"
+    packages = "mariadb-server, php8.2-mysql, php8.2-gd"
 
     [resources.database]
     type = "mysql"

From 9223db532be13018f29b1284b219cb643b3fdb64 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sat, 18 Nov 2023 15:14:19 +0100
Subject: [PATCH 14/14] Update manifest.toml : add dependency to
 php8.2-mbstring

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 197aaf2..feb7864 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -60,7 +60,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-mysql, php8.2-gd"
+    packages = "mariadb-server, php8.2-mysql, php8.2-gd, php8.2-mbstring"
 
     [resources.database]
     type = "mysql"