From 095f954682e2c4516fd1ad587f45f91252102e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 16 Mar 2023 20:19:47 +0100 Subject: [PATCH] Cleaning --- check_process | 24 ------------------------ doc/ADMIN.md | 2 ++ doc/ADMIN_fr.md | 1 + doc/DISCLAIMER.md | 4 ---- doc/DISCLAIMER_fr.md | 3 --- scripts/install | 5 ----- scripts/remove | 5 ----- scripts/restore | 24 ++++++------------------ scripts/upgrade | 5 ----- 9 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 check_process create mode 100644 doc/ADMIN.md create mode 100644 doc/ADMIN_fr.md delete mode 100644 doc/DISCLAIMER.md delete mode 100644 doc/DISCLAIMER_fr.md diff --git a/check_process b/check_process deleted file mode 100644 index 575dd15..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Nom du test - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=e52fe0eb74d4e8e37bb1c04872ef425cfd914758 - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=e52fe0eb74d4e8e37bb1c04872ef425cfd914758 - name=Merge pull request #13 from YunoHost-Apps/1.18.3 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..1218080 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1,2 @@ +Backdrop CMS includes an update utility to handle any necessary changes to the database schema or configuration. +Run `update.php` by navigating to `http://__DOMAIN__/core/update.php` [See instructions](https://backdropcms.org/upgrade) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md new file mode 100644 index 0000000..32da9d7 --- /dev/null +++ b/doc/ADMIN_fr.md @@ -0,0 +1 @@ +Backdrop CMS inclus un utilitaire de mise à jour pour gérer toutes les modifications nécessaires à configuration et base de données. Exécuter `update.php` en naviguant vers `https://__DOMAIN__/core/update.php` [Voir les instructions](https://backdropcms.org/upgrade) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index c78b834..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,4 +0,0 @@ -#### upgrade - -Backdrop CMS includes an update utility to handle any necessary changes to the database schema or configuration. -Run `update.php` by navigating to `http://example.com/core/update.php` [See instructions](https://backdropcms.org/upgrade) diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md deleted file mode 100644 index 6fec59c..0000000 --- a/doc/DISCLAIMER_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -## Configuration - -Backdrop CMS inclus un utilitaire de mise à jour pour gérer toutes les modifications nécessaires à configuration et base de données. Exécuter `update.php` en naviguant vers `https://example.com/core/update.php` [Voir les instructions](https://backdropcms.org/upgrade) diff --git a/scripts/install b/scripts/install index 55f1415..1f68e3a 100644 --- a/scripts/install +++ b/scripts/install @@ -29,11 +29,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 - # Create a dedicated PHP-FPM config ynh_add_fpm_config diff --git a/scripts/remove b/scripts/remove index e149006..61db822 100644 --- a/scripts/remove +++ b/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=3 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index bb2def1..1613e18 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,20 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 - -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" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -42,11 +28,13 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=5 ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# GENERIC FINALIZATION +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -# RELOAD NGINX AND PHP-FPM -#================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2 +ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 + +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" ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index f2d6ab5..6edcc90 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,11 +41,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config