From bfab1f58cec3912e18f08c5bcd0d4f19a7e8aac0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 5 Apr 2022 11:05:38 +0200
Subject: [PATCH] Upgrade to PHP8.0

---
 conf/.env.example  |  4 ++--
 conf/nginx.conf    |  5 +----
 manifest.json      |  4 ++--
 scripts/_common.sh |  4 ++--
 scripts/install    |  1 +
 scripts/remove     | 16 ++++++++--------
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/conf/.env.example b/conf/.env.example
index 967b49a..b5445f7 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -6,7 +6,7 @@ APP_NAME=Plainpad
 # This value determines the "environment" your application is currently
 # running in. This may determine how you prefer to configure various
 # services the application utilizes. Set this in your ".env" file.
-APP_ENV=local
+APP_ENV=production
 
 # This key is used by the Illuminate encrypter service and should be set
 # to a random, 32 character string, otherwise these encrypted strings
@@ -44,7 +44,7 @@ DB_PORT=3306
 DB_DATABASE=__DB_NAME__
 
 # The database username for the connection.
-DB_USERNAME=__DB_NAME__
+DB_USERNAME=__DB_USER__
 
 # The database password for the connection.
 DB_PASSWORD=__DB_PWD__
diff --git a/conf/nginx.conf b/conf/nginx.conf
index c385314..554831e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,7 +6,7 @@ location __PATH__/ {
 
   index index.php index.html;
 
-  #client_max_body_size 50M;
+  client_max_body_size 50M;
 
   try_files $uri $uri/ __PATH__/__PATH__/index.php?$query_string;
   
@@ -20,7 +20,4 @@ location __PATH__/ {
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
-
-  # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.json b/manifest.json
index 919e288..3e79996 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Self hosted, note taking application",
         "fr": "Application de prise de notes auto-hébergée"
     },
-    "version": "1.0.0~ynh1",
+    "version": "1.0.0~ynh2",
     "url": "https://alextselegidis.com/get/plainpad",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -26,7 +26,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 88da38a..e9f1973 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql"
+pkg_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index b73c88b..70fbf4a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -28,6 +28,7 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 key=$(ynh_string_random --length=32)
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
diff --git a/scripts/remove b/scripts/remove
index 2300b9a..f75dd97 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,14 +29,6 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=2
 # Remove a database if it exists, along with the associated user
 ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
@@ -61,6 +53,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
+ynh_remove_app_dependencies
+
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================