Merge pull request #16 from YunoHost-Apps/resource

Resource

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/
 

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/
 

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,12 @@ 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"
+        rename = "ifm.php"
 
     [resources.system_user]
 
@@ -55,5 +58,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"
 

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"

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
 

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

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"
@@ -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