From f90bddb344c31c9375e41b0bbc8a381a484a954b 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 18:24:54 +0100 Subject: [PATCH 1/5] Fix ports --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index 6e20e71..e0d501e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,6 +56,10 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + api.url = "/api" + api.show_tile = false + api.allowed = "visitors" + api.auth_header = false [resources.apt] From cdac84fd022aefc554cb4e6f45ef8fbd4f7312a0 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 18:37:02 +0100 Subject: [PATCH 2/5] Fix dependencies --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index e0d501e..dbba9b2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -63,4 +63,4 @@ ram.runtime = "50M" [resources.apt] - packages = "php8.2-zip, php8.2-curl, php8.2-mbstring, php8.2-ldap, php8.2-xml" + packages = "php8.2-zip, php8.2-bz2, php8.2-gd, php8.2-curl, php8.2-mbstring, php8.2-ldap, php8.2-xml" From d9f27187daa71e8107931e0c1e1525003fc2a4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:16:01 +0200 Subject: [PATCH 3/5] Bump revision --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index dbba9b2..51fa144 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~ynh2" +version = "4.0.2~ynh3" maintainers = [] From 2c5ae521d007633337ce100665dbc6d926962cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:17:11 +0200 Subject: [PATCH 4/5] cleaning --- scripts/backup | 4 ---- scripts/install | 20 +------------------- scripts/remove | 2 -- scripts/upgrade | 41 +++-------------------------------------- 4 files changed, 4 insertions(+), 63 deletions(-) diff --git a/scripts/backup b/scripts/backup index 62ffbee..425807a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -33,10 +33,6 @@ ynh_backup --src_path="$data_dir" --is_big ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/install b/scripts/install index 86cef37..364ba68 100755 --- a/scripts/install +++ b/scripts/install @@ -9,22 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -40,10 +24,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= diff --git a/scripts/remove b/scripts/remove index 61db822..ac762c0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -14,10 +14,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4324d3b..a231b47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,45 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=2 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=2 - - ynh_setup_source --dest_dir="$install_dir" -fi +ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -57,10 +24,8 @@ 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 --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= From 69a1e5cc8886aaf41d7d2afd03f7b49b0bb689a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Jun 2024 17:42:51 +0000 Subject: [PATCH 5/5] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6ed3137..082a237 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~ynh2 +**Shipped version:** 4.0.2~ynh3 **Demo:** diff --git a/README_es.md b/README_es.md index 853746a..a58172a 100644 --- a/README_es.md +++ b/README_es.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) -**Versión actual:** 4.0.2~ynh2 +**Versión actual:** 4.0.2~ynh3 **Demo:** diff --git a/README_eu.md b/README_eu.md index 3253f81..502fed8 100644 --- a/README_eu.md +++ b/README_eu.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) -**Paketatutako bertsioa:** 4.0.2~ynh2 +**Paketatutako bertsioa:** 4.0.2~ynh3 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 9753b30..fb4ca85 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~ynh2 +**Version incluse :** 4.0.2~ynh3 **Démo :** diff --git a/README_gl.md b/README_gl.md index 0331fd2..d0a4a2a 100644 --- a/README_gl.md +++ b/README_gl.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) -**Versión proporcionada:** 4.0.2~ynh2 +**Versión proporcionada:** 4.0.2~ynh3 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 629a0ac..83c552c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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) -**分发版本：** 4.0.2~ynh2 +**分发版本：** 4.0.2~ynh3 **演示：**