From 183d59696ec8f3a0318763e77e49472972b0f097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 5 Jul 2022 18:43:59 +0200
Subject: [PATCH] reorder

---
 doc/DECRIPTION.md |  5 +++++
 manifest.json     |  2 +-
 scripts/install   |  1 -
 scripts/remove    | 16 ++++++++--------
 scripts/restore   | 13 +++++++------
 scripts/upgrade   | 30 +++++++++++++++---------------
 6 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 doc/DECRIPTION.md

diff --git a/doc/DECRIPTION.md b/doc/DECRIPTION.md
new file mode 100644
index 0000000..45ff103
--- /dev/null
+++ b/doc/DECRIPTION.md
@@ -0,0 +1,5 @@
+Bludit is a web application to build your own website or blog in seconds, it's completely free and open source. Bludit uses files in JSON format to store the content, you don't need to install or configure a database. You only need a web server with PHP support.
+
+Bludit is a Flat-File CMS.
+
+Bludit supports Markdown and HTML code for the content.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ead749e..81b1c3f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm"
+        "php8.0-fpm"
     ],
     "arguments": {
         "install": [
diff --git a/scripts/install b/scripts/install
index 21539ff..a1f7348 100644
--- a/scripts/install
+++ b/scripts/install
@@ -45,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion
 
 #=================================================
 # INSTALL DEPENDENCIES
diff --git a/scripts/remove b/scripts/remove
index a806d67..eb4a012 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,14 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
@@ -52,6 +44,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=3
 # 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
+ynh_remove_app_dependencies
+
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 493b0a4..08a3e74 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -37,12 +37,6 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -77,6 +71,13 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6
 
 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"
+
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index d3effcb..876924c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,21 +59,6 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -103,6 +88,13 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -111,6 +103,14 @@ 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
+
 #=================================================
 # RELOAD NGINX
 #=================================================