From 935134c90bedfbbee30777cdf7532aa93cbe9c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:33:04 +0100
Subject: [PATCH 01/10] Update updater.sh

---
 .github/workflows/updater.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index bf052d0..872ee8b 100755
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -14,8 +14,8 @@
 #=================================================
 
 # Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
+current_version=$(cat manifest.toml | jq -j '.version|split("~")[0]')
+repo=$(cat manifest.toml | jq -j '.upstream.code|split("https://github.com/")[1]')
 # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
 version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
 assets="https://github.com/jasonmunro/cypht/archive/refs/tags/$version.tar.gz"
@@ -98,7 +98,7 @@ echo "... conf/$src.src updated"
 #=================================================
 
 # Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
+echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml
 
 # No need to update the README, yunohost-bot takes care of it
 

From f45b1cc25211d94e4a5bf4ba780a07dec6ace6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 22 Feb 2023 18:18:01 +0100
Subject: [PATCH 02/10] Update updater.sh

---
 .github/workflows/updater.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index 872ee8b..fb1db0d 100755
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -14,8 +14,8 @@
 #=================================================
 
 # Fetching information
-current_version=$(cat manifest.toml | jq -j '.version|split("~")[0]')
-repo=$(cat manifest.toml | jq -j '.upstream.code|split("https://github.com/")[1]')
+current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
+repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://github.com/")[1]')
 # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
 version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
 assets="https://github.com/jasonmunro/cypht/archive/refs/tags/$version.tar.gz"
@@ -98,7 +98,7 @@ echo "... conf/$src.src updated"
 #=================================================
 
 # Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml
+sed -i "s/^version\s*=.*/version = \"$version~ynh1\"/" manifest.toml
 
 # No need to update the README, yunohost-bot takes care of it
 

From a411dc1c0a313a42955715874b814e09f6afcee8 Mon Sep 17 00:00:00 2001
From: tituspijean <titus@pijean.ovh>
Date: Fri, 24 Feb 2023 18:17:00 +0100
Subject: [PATCH 03/10] [autopatch] Upgrade auto-updater

---
 .github/workflows/updater.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
index fb72ba0..a56d7cb 100644
--- a/.github/workflows/updater.yml
+++ b/.github/workflows/updater.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run the updater script
@@ -33,7 +33,7 @@ jobs:
       - name: Create Pull Request
         id: cpr
         if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Update to version ${{ env.VERSION }}

From 31d8e32aee1d3417eea21ca17f1bc1efcd498384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 07:58:49 +0100
Subject: [PATCH 04/10] Fix

---
 manifest.toml      |  9 ++++--
 scripts/change_url | 74 +---------------------------------------------
 scripts/install    |  1 -
 scripts/upgrade    |  9 +++---
 4 files changed, 12 insertions(+), 81 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 9bd9b05..bb30dd9 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.8"
+yunohost = ">= 11.1.14"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -51,6 +51,11 @@ ram.runtime = "50M"
     type = "password"
 
 [resources]
+
+    [resources.sources.main]
+    url= "https://github.com/jasonmunro/cypht/archive/2e9875c8ccfee750b34958587507f1a9c2ae8b67.zip"
+    sha256 = "17638c5eae1d79763b9496f531f76b4db17524e4f0a41ab1be932d271f8a0007"
+
     [resources.system_user]
 
     [resources.install_dir]
@@ -61,7 +66,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "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.0-mbstring php8.0-gnupg php8.0-memcached php8.0-mysql php8.0-gd php8.0-curl php8.0-fileinfo"
 
     [resources.database]
     type = "mysql"
diff --git a/scripts/change_url b/scripts/change_url
index 9484aaa..a4fcb69 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -9,49 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-#=================================================
-# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-	change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-	change_path=1
-fi
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -59,36 +16,7 @@ fi
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
-	# Make a backup of the original NGINX config file if modified
-	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for NGINX helper
-	domain="$old_domain"
-	path_url="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
-	# Delete file checksum for the old conf file location
-	ynh_delete_file_checksum --file="$nginx_conf_path"
-	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_change_url_nginx_config
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index 34fe631..fd3e3c2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -38,7 +38,6 @@ ynh_script_progression --message="Setting up source files..." --weight=3
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 326c7d2..7f9f261 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,7 +58,6 @@ then
 	ynh_setup_source --dest_dir="$install_dir" --keep="hm3.ini"
 fi
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -78,12 +77,12 @@ ynh_add_nginx_config
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression --message="Updating a configuration file..." --weight=1
+#ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/hm3.sample.ini" --destination="$install_dir/hm3.ini"
+#ynh_add_config --template="../conf/hm3.sample.ini" --destination="$install_dir/hm3.ini"
 
-chmod 400 "$install_dir/hm3.ini"
-chown $app:$app "$install_dir/hm3.ini"
+#chmod 400 "$install_dir/hm3.ini"
+#chown $app:$app "$install_dir/hm3.ini"
 
 #=================================================
 # END OF SCRIPT

From cbc758dd4824e6848389969ae75cca6f1c26bc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 07:59:48 +0100
Subject: [PATCH 05/10] Fix

---
 manifest.toml      | 4 ++--
 scripts/_common.sh | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index bb30dd9..49d48d6 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,8 +2,8 @@ packaging_format = 2
 
 id = "cypht"
 name = "Cypht"
-description.en = "Lightweight Open Source webmail written in PHP and JavaScript"
-description.fr = "Webmail Open Source léger écrit en PHP et JavaScript"
+description.en = "Lightweight Open Source webmail"
+description.fr = "Webmail Open Source léger"
 
 version = "1.3.0~ynh4"
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index dbd731b..5b7c67d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -9,10 +9,6 @@
 # Composer version
 YNH_COMPOSER_VERSION="2.3.5"
 
-YNH_PHP_VERSION="8.0"
-
-#REMOVEME? php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gnupg php${YNH_PHP_VERSION}-memcached php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-fileinfo"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

From ef0a7a0ac42550f66249594064bb63b0bc3d36a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 08:05:34 +0100
Subject: [PATCH 06/10] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 49d48d6..979fd47 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -53,8 +53,8 @@ ram.runtime = "50M"
 [resources]
 
     [resources.sources.main]
-    url= "https://github.com/jasonmunro/cypht/archive/2e9875c8ccfee750b34958587507f1a9c2ae8b67.zip"
-    sha256 = "17638c5eae1d79763b9496f531f76b4db17524e4f0a41ab1be932d271f8a0007"
+    url= "https://github.com/jasonmunro/cypht/archive/eb3aac3ad3042eaf43a015a325ff59d09aceb52a.zip"
+    sha256 = "388dec7e7714444e2a0ab00b8aad42f42816e434b382e8780fcb614289283ddf"
 
     [resources.system_user]
 

From ea89c999b78f8e4c328f4facc7d2eccc8914465f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 08:05:46 +0100
Subject: [PATCH 07/10] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 979fd47..561dc7f 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.0~ynh4"
+version = "1.3.0~ynh5"
 
 maintainers = ["eric_G"]
 

From 3f6f6231c69ab1acdf87afa98bbf55b994e6a266 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sat, 11 Mar 2023 07:05:51 +0000
Subject: [PATCH 08/10] 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 efbcf22..1065e81 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.0~ynh4
+**Shipped version:** 1.3.0~ynh5
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 8b143f7..ad6a49b 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.0~ynh4
+**Version incluse :** 1.3.0~ynh5
 
 ## Captures d’écran
 

From 29c3b587d4e7c8cb6e6e3d9f3898656425e098ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 08:37:22 +0100
Subject: [PATCH 09/10] Update restore

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

diff --git a/scripts/restore b/scripts/restore
index f02f8f9..68f750e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -28,10 +27,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-mkdir -p $data_dir
-
-chmod 750 "$data_dir"
-chmod -R o-rwx "$data_dir"
 chown -R $app:www-data "$data_dir"
 
 #=================================================

From 8b47ac6c65114431090ebcfd0ef25f1fdfaadac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 11 Mar 2023 08:39:51 +0100
Subject: [PATCH 10/10] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 561dc7f..742a938 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,10 +19,10 @@ code = "https://github.com/jasonmunro/cypht"
 yunohost = ">= 11.1.14"
 architectures = "all"
 multi_instance = true
-ldap = false
+ldap = true
 sso = false
 disk = "50M"
-ram.build = "50M"
+ram.build = "200M"
 ram.runtime = "50M"
 
 [install]