diff --git a/README.md b/README.md index 6407d8f..eefd590 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in # Tiny File Manager -TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application runs on PHP 5.5+, It allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. +TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. ## Demo @@ -44,11 +44,9 @@ Tinyfilemanager is highly documented on the [wiki pages](https://github.com/pras - :mag_right: Search - Search and filter files using `datatable js` - :file_folder: Exclude folders and files from listing - :globe_with_meridians: Multi-language(20+) support and for translations `translation.json` is file required -- :bangbang: lots more... - -**Shipped version:** 2.4.7~ynh1 +**Shipped version:** 2.5.0~ynh1 **Demo:** https://tinyfilemanager.github.io/demo/ diff --git a/README_fr.md b/README_fr.md index d1bdd93..48730f2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour # Tiny File Manager -TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application runs on PHP 5.5+, It allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. +TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. ## Demo @@ -44,11 +44,9 @@ Tinyfilemanager is highly documented on the [wiki pages](https://github.com/pras - :mag_right: Search - Search and filter files using `datatable js` - :file_folder: Exclude folders and files from listing - :globe_with_meridians: Multi-language(20+) support and for translations `translation.json` is file required -- :bangbang: lots more... - -**Version incluse :** 2.4.7~ynh1 +**Version incluse :** 2.5.0~ynh1 **Démo :** https://tinyfilemanager.github.io/demo/ diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index d59988d..370e064 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,6 +1,6 @@ # Tiny File Manager -TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application runs on PHP 5.5+, It allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. +TinyFileManager is web based file manager and it is a simple, fast and small file manager with a single file, multi-language ready web application for storing, uploading, editing and managing files and folders online via web browser. The Application allows the creation of multiple users and each user can have its own directory and a build-in support for managing text files with cloud9 IDE and it supports syntax highlighting for over 150+ languages and over 35+ themes. ## Demo @@ -27,5 +27,3 @@ Tinyfilemanager is highly documented on the [wiki pages](https://github.com/pras - :mag_right: Search - Search and filter files using `datatable js` - :file_folder: Exclude folders and files from listing - :globe_with_meridians: Multi-language(20+) support and for translations `translation.json` is file required -- :bangbang: lots more... - diff --git a/manifest.json b/manifest.json index 250caf0..0e47de6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web based file manager", "fr": "Gestionnaire de fichiers simple" }, - "version": "2.4.7~ynh1", + "version": "2.5.0~ynh1", "url": "https://tinyfilemanager.github.io/", "upstream": { "license": "GPL-3.0", diff --git a/scripts/install b/scripts/install index a82c74e..d641b67 100755 --- a/scripts/install +++ b/scripts/install @@ -82,14 +82,6 @@ chown -R $app:www-data "$final_path" # rename tinyfilemanager to index mv $final_path/tinyfilemanager.php $final_path/index.php -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -99,6 +91,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # CREATE DATA DIRECTORY #================================================= diff --git a/scripts/remove b/scripts/remove index cdbd89a..9e9495f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -47,14 +47,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies before removing php-fpm -ynh_remove_app_dependencies - #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= @@ -63,6 +55,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=1 + +# Remove metapackage and its dependencies before removing php-fpm +ynh_remove_app_dependencies + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index c12aa70..9972d86 100755 --- a/scripts/restore +++ b/scripts/restore @@ -29,7 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -# path_url=$(ynh_app_setting_get --app=$app --key=path) +path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) @@ -42,15 +42,6 @@ ynh_script_progression --message="Validating restoration parameters..." --weight test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -100,6 +91,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #=================================================