From e42b2efb7e401533a6a2cef9de30b4b0c1268598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:14:29 +0200
Subject: [PATCH 1/4] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 51eeb43..575b517 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -16,7 +16,7 @@ admindoc = "https://cypht.org/install.html"
 code = "https://github.com/jasonmunro/cypht"
 
 [integration]
-yunohost = ">= 11.1.16"
+yunohost = ">= 11.1.21"
 architectures = "all"
 multi_instance = true
 ldap = true
@@ -68,7 +68,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.0-mbstring php8.0-gnupg php8.0-memcached php8.0-mysql php8.0-gd php8.0-curl php8.0-fileinfo"
+    packages = "mariadb-server php8.2-mbstring php8.2-gnupg php8.2-memcached php8.2-mysql php8.2-gd php8.2-curl php8.2-fileinfo"
 
     [resources.database]
     type = "mysql"

From ca0830ce43d7a0bbfa8a20527fddd908025c5176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:17:01 +0200
Subject: [PATCH 2/4] cleaning

---
 manifest.toml      |  1 +
 scripts/_common.sh |  2 +-
 scripts/install    | 12 +-----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 575b517..84ce50a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -63,6 +63,7 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
+    subdirs = ["attachments", "users", "app_data"]
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5b7c67d..1a755c6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,7 @@
 #=================================================
 
 # Composer version
-YNH_COMPOSER_VERSION="2.3.5"
+YNH_COMPOSER_VERSION="2.5.8"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index fd3e3c2..8523085 100755
--- a/scripts/install
+++ b/scripts/install
@@ -61,17 +61,6 @@ ynh_script_progression --message="Installing $app with Composer..." --weight=10
 
 ynh_install_composer --install_args="--ignore-platform-reqs"
 
-#=================================================
-# CREATE DATA DIRECTORY
-#=================================================
-ynh_script_progression --message="Creating a data directory..." --weight=1
-
-mkdir -p $data_dir/{attachments,users,app_data}
-
-chmod 750 "$data_dir"
-chmod -R o-rwx "$data_dir"
-chown -R $app:www-data "$data_dir"
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -89,6 +78,7 @@ ynh_script_progression --message="Adding an admin..." --weight=3
 
 #Generate the run-time configuration
 php$phpversion $install_dir/scripts/config_gen.php
+
 # create an admin account
 php$phpversion $install_dir/scripts/create_account.php $admin $password
 

From 0e854933b6be610b715fe34498cc68649bc14377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:17:22 +0200
Subject: [PATCH 3/4] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 84ce50a..8de150b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Cypht"
 description.en = "Lightweight Open Source webmail"
 description.fr = "Webmail Open Source léger"
 
-version = "1.3.2023.07.01~ynh6"
+version = "1.3.2023.07.01~ynh7"
 
 maintainers = ["eric_G"]
 

From 64f2467bb9c6dfd7ec453769d7f166d97fdf793c Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 5 Jul 2023 08:17:28 +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 c9bd388..a03e35e 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ All your E-mail, from all your accounts, in one place. Cypht is not your father'
 Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code.
 
 
-**Shipped version:** 1.3.2023.07.01~ynh6
+**Shipped version:** 1.3.2023.07.01~ynh7
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 80cc1b2..52ba781 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
 
 Cypht est un client de messagerie web. Vous pouvez accéder à vos comptes de messagerie qui supportent IMAP, POP3 ou SMTP - comme la plupart.
 
-**Version incluse :** 1.3.2023.07.01~ynh6
+**Version incluse :** 1.3.2023.07.01~ynh7
 
 ## Captures d’écran