From 8adadce339a73dfe6c6dd3da844d22aea76268fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 26 Sep 2023 21:57:46 +0200
Subject: [PATCH] cleaning

---
 manifest.toml   | 4 ++--
 scripts/install | 9 ++-------
 scripts/remove  | 7 +------
 scripts/upgrade | 9 +--------
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 0e8060c..8d380c6 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,7 +18,7 @@ userdoc = "https://site.devome.com/fr/grr/telechargement/category/2-informations
 code = "https://github.com/JeromeDevome/GRR"
 
 [integration]
-yunohost = ">= 11.1.20"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = true
@@ -58,7 +58,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-ldap php8.2-gd php8.2-mbstring php8.2-mysqli php8.2-mysqlnd php8.2-xml"
+    packages = "mariadb-server, php8.2-ldap, php8.2-gd, php8.2-mbstring, php8.2-mysqli, php8.2-mysqlnd, php8.2-xml"
 
     [resources.database]
     type = "mysql"
diff --git a/scripts/install b/scripts/install
index 50efca4..03ef57d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -22,16 +22,11 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
-
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC SETUP
diff --git a/scripts/remove b/scripts/remove
index 79cb058..dd7376b 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,16 +12,11 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1
-
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 6725c8b..992cc56 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,13 +38,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
-
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 #=================================================
 # UPDATE A CONFIG FILE
@@ -64,8 +59,6 @@ chown $app:$app "$install_dir/include/connect.inc.php"
 #=================================================
 ynh_script_progression --message="Updating database..." --weight=1
 
-#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-
 pushd $install_dir/admin
 	php${phpversion} admin_maj.php ""
 popd