From 0a57bec8bab230c8cd817776eaad134bb88093c8 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 17 Jun 2024 19:04:19 +0200
Subject: [PATCH] remove php-fpm config

---
 conf/extra_php-fpm.conf |  4 ----
 scripts/install         | 14 +-------------
 scripts/remove          |  3 ---
 scripts/upgrade         | 17 -----------------
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 conf/extra_php-fpm.conf

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
deleted file mode 100644
index 700c37c..0000000
--- a/conf/extra_php-fpm.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-; Additional php.ini defines, specific to this pool of workers.
-
-php_admin_value[upload_max_filesize] = 50M
-php_admin_value[post_max_size] = 50M
diff --git a/scripts/install b/scripts/install
index dc476f3..019f180 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,18 +15,12 @@ source /usr/share/yunohost/helpers
 
 random_key=$(ynh_string_random --length=32)
 email=$(ynh_user_get_info --username=$admin --key="mail")
-fpm_footprint="low"
-fpm_free_footprint=0
-fpm_usage="low"
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
 
 ynh_app_setting_set --app=$app --key=random_key --value=$random_key
-ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -48,12 +42,6 @@ ynh_setup_source --dest_dir="$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
-
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -107,7 +95,7 @@ pushd "$install_dir"
 	ynh_app_setting_set --app=$app --key=mobile_key --value=$mobile_key
 	ynh_secure_remove --file="$install_dir/key.txt"
 	ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan config:cache
-        ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan optimize:clear
+    ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan optimize:clear
 popd
 
 # Calculate and store the config file checksum into the app settings
diff --git a/scripts/remove b/scripts/remove
index a05a07a..ce76378 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,9 +17,6 @@ ynh_script_progression --message="Removing system configurations related to $app
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove the dedicated PHP-FPM config
-ynh_remove_fpm_config
-
 # Remove metapackage and its dependencies
 ynh_remove_nodejs
 
diff --git a/scripts/upgrade b/scripts/upgrade
index f08b1dd..7f36a46 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -38,9 +38,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 #=================================================
 ynh_script_progression --message="Updating $app's configuration files..." --weight=1
 
-# Create a dedicated PHP-FPM config
-ynh_add_fpm_config
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
@@ -108,26 +105,12 @@ pushd "$install_dir"
 	ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan config:cache
 popd
 
-#if ynh_version_gt "2.15.0" "${previous_version}" ; then
-#	ynh_script_progression --message="Upgrading for 2.15.0..."
-#	pushd "$install_dir"
-#		ynh_exec_warn_less ynh_exec_as $app php$phpversion artisan monica:moveavatarstophotosdirectory
-#	popd
-#fi
-
 # Calculate and store the config file checksum into the app settings
 ynh_store_file_checksum --file="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
 
-#==================================================
-# FIX PHP VERSION
-#==================================================
-ynh_script_progression --message="Fixing PHP version in package.json..." --weight=1
-
-ynh_replace_string --target_file="$install_dir/package.json" --match_string="php artisan lang:generate -vvv" --replace_string="php$phpversion artisan lang:generate -vvv"
-
 #=================================================
 # INSTALL THE CRON FILE
 #=================================================