From e9f7fcfee9b5e59ffd9769878124e0a4f4631237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 21:17:44 +0100 Subject: [PATCH 1/8] fix --- scripts/install | 16 ++++++++-------- scripts/restore | 9 ++++++++- 2 files changed, 16 insertions(+), 9 deletions(-) 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/restore b/scripts/restore index c12aa70..52e9127 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) @@ -100,6 +100,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..." --time --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #================================================= From ab19aac87e27f3f07c6093c0349d345d5eeb39d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 21:18:29 +0100 Subject: [PATCH 2/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From f420f1771ee68b1d33a7cc6d7fef725c012e5b4b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Dec 2022 20:18:34 +0000 Subject: [PATCH 3/8] 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 6407d8f..748fbea 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Tinyfilemanager is highly documented on the [wiki pages](https://github.com/pras -**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..3abec8a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -48,7 +48,7 @@ Tinyfilemanager is highly documented on the [wiki pages](https://github.com/pras -**Version incluse :** 2.4.7~ynh1 +**Version incluse :** 2.5.0~ynh1 **Démo :** https://tinyfilemanager.github.io/demo/ From 050ded6ee69b2ae46eb3d96bf18afc232d84f6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 21:21:05 +0100 Subject: [PATCH 4/8] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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... - From d1cd8adfe67bbba9d9310231c2d4330ad319a85f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Dec 2022 20:21:16 +0000 Subject: [PATCH 5/8] Auto-update README --- README.md | 4 +--- README_fr.md | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 748fbea..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,8 +44,6 @@ 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.5.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 3abec8a..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,8 +44,6 @@ 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.5.0~ynh1 From 60d4926bffc39fa3f22f50597d5ab5b50688bde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:05:47 +0100 Subject: [PATCH 6/8] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 52e9127..c6f3bc5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -103,7 +103,7 @@ 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..." --time --weight=1 +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" From 6e8694773cff3c73f71341e3cc2fc0d0048f3586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:07:49 +0100 Subject: [PATCH 7/8] Update remove --- scripts/remove | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 #================================================= From 589947bc6e1e41ac9f84256e15598a3135f1215b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Dec 2022 23:08:35 +0100 Subject: [PATCH 8/8] Update restore --- scripts/restore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index c6f3bc5..9972d86 100755 --- a/scripts/restore +++ b/scripts/restore @@ -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 #=================================================