Merge pull request #20 from YunoHost-Apps/testing

Automated testing -> master

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:** <https://ifmdemo.gitea.de/>
 

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:** <https://ifmdemo.gitea.de/>
 

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:** <https://ifmdemo.gitea.de/>
 

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 :** <https://ifmdemo.gitea.de/>
 

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:** <https://ifmdemo.gitea.de/>
 

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
 
 **演示：** <https://ifmdemo.gitea.de/>
 

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 = []
 
@@ -56,7 +56,11 @@ ram.runtime = "50M"
 
     [resources.permissions]
     main.url = "/"
+    api.url = "/api"
+    api.show_tile = false
+    api.allowed = "visitors"
+    api.auth_header = false
 
     [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"

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"
 
 #=================================================

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
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================

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
 
 #=================================================

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" ]
+ynh_setup_source --dest_dir="$install_dir"
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=2
-
-	ynh_setup_source --dest_dir="$install_dir"
-fi
 
 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
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================