From c8dac309676b0ac81e495e46d8b522be7f429fc1 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 14 Apr 2022 08:49:07 +0200
Subject: [PATCH] php8.0

---
 conf/noalyss.conf  |  4 ++--
 manifest.json      |  2 +-
 scripts/_common.sh |  2 +-
 scripts/restore    | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/conf/noalyss.conf b/conf/noalyss.conf
index 46fee27..ad0a22a 100644
--- a/conf/noalyss.conf
+++ b/conf/noalyss.conf
@@ -5,7 +5,7 @@ define("PG_PATH","/usr/bin");
 define("PG_RESTORE","/usr/bin/pg_restore ");
 define("PG_DUMP","/usr/bin/pg_dump ");
 define ("PSQL","/usr/bin/psql");
-define ("noalyss_user","__DB_NAME__");
+define ("noalyss_user","__DB_USER__");
 define ("noalyss_password","__DB_PWD__");
 define ("noalyss_psql_port","5432");
 define ("noalyss_psql_host","localhost");
@@ -18,7 +18,7 @@ define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__");
 define ("LOCALE",1);
 define ("domaine","");
 define ("MULTI",1);
-define ("dbname","");
+define ("dbname","__DB_NAME__");
  // Uncomment to DEBUG
 // define ("DEBUG",TRUE);
 // Uncomment to log your input
diff --git a/manifest.json b/manifest.json
index 8997053..6ed9678 100644
--- a/manifest.json
+++ b/manifest.json
@@ -26,7 +26,7 @@
     "multi_instance": false,
     "services": [
         "nginx",
-        "php7.3-fpm"
+        "php8.0-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8e86cdb..402bc0a 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"
 
 pkg_dependencies="postgresql apt-transport-https libgd-dev php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-php-gettext"
 
diff --git a/scripts/restore b/scripts/restore
index 58361ab..6c30bd1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -64,13 +64,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring PHP-FPM configuration..."
-
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
@@ -81,6 +74,13 @@ ynh_script_progression --message="Reinstalling dependencies..."
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring PHP-FPM configuration..."
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================