From 8db62b049b5296df77d702635b2b87785038bfdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:56:40 +0100 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2d88ddc..0f86dc4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "IFM" description.en = "Improved File Manager" description.fr = "Gestionnaire de fichiers amélioré" -version = "4.0.2~ynh1" +version = "4.0.2~ynh2" maintainers = ["eric_G"] @@ -40,9 +40,11 @@ ram.runtime = "50M" default = "visitors" [resources] - #[resources.sources.main] - #url = "https://github.com/misterunknown/ifm/releases/download/v4.0.0/ifm.php" - #sha256 = "59a888e454a083a420c074e303507e0efd41fb10272f52860c8e6d9cc640aea4" + [resources.sources.main] + in_subdir = false + extract = false + url = "https://github.com/misterunknown/ifm/releases/download/v4.0.2/ifm.php" + sha256 = "902e45ef45a5a2c1fc8a1186f1acf3f4588071791e4bc8175de067eb33070594" [resources.system_user] @@ -55,5 +57,5 @@ ram.runtime = "50M" [resources.apt] - packages = "php8.0-zip, php8.0-curl, php8.0-mbstring, php8.0-ldap, php8.0-json, php8.0-xml" + packages = "php8.2-zip, php8.2-curl, php8.2-mbstring, php8.2-ldap, php8.2-xml" From 8871ba4698f11340ba93ae3538cf7dbdf7aad994 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 20 Dec 2023 17:56:45 +0000 Subject: [PATCH 2/7] 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 7363f0f..38ce4cb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The IFM is a web-based filemanager, which comes as a single file solution using - simple authentication (LDAP via `ldap_bind` possible) -**Shipped version:** 4.0.2~ynh1 +**Shipped version:** 4.0.2~ynh2 **Demo:** https://ifmdemo.gitea.de/ diff --git a/README_fr.md b/README_fr.md index 4135db0..3747bdc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ L'IFM est un gestionnaire de fichiers basé sur le Web, qui se présente sous la - aperçu de l'image - authentification simple (LDAP via `ldap_bind` possible) -**Version incluse :** 4.0.2~ynh1 +**Version incluse :** 4.0.2~ynh2 **Démo :** https://ifmdemo.gitea.de/ From 706fa4ccfeacc6a689b3d84e1ed192a46123d5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:57:31 +0100 Subject: [PATCH 3/7] Update install --- scripts/install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index b281f5b..86cef37 100755 --- a/scripts/install +++ b/scripts/install @@ -30,10 +30,7 @@ ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 -#ynh_setup_source --dest_dir="$install_dir" - -mkdir -p $install_dir -mv "../sources/ifm.php" "$install_dir/ifm.php" +ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From f06b466766f5aef76a86d19a292677e9503f139d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:57:56 +0100 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 80d68b0..ef2991e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,7 +46,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=2 - mv -f "../sources/ifm.php" "$install_dir/ifm.php" + ynh_setup_source --dest_dir="$install_dir" fi chmod -R o-rwx "$install_dir" From 0d8b662de913dfbef5499932382b25b1d96ff1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:58:23 +0100 Subject: [PATCH 5/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ef2991e..4324d3b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config From 9a5a32979650666373984f07e2fa4d39f88b337e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:58:55 +0100 Subject: [PATCH 6/7] cleaning --- scripts/remove | 5 ----- scripts/restore | 11 ++--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/remove b/scripts/remove index 79cb058..61db822 100755 --- 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 cc9ac6c..ab3393f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,15 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -45,6 +36,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #================================================= From d40469095d693cf109d947d424203ef9b667e405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 1 Jan 2024 15:06:10 +0100 Subject: [PATCH 7/7] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 0f86dc4..ce7e041 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,6 +45,7 @@ ram.runtime = "50M" extract = false url = "https://github.com/misterunknown/ifm/releases/download/v4.0.2/ifm.php" sha256 = "902e45ef45a5a2c1fc8a1186f1acf3f4588071791e4bc8175de067eb33070594" + rename = "ifm.php" [resources.system_user]