From 77fa4d0a6b38f5f3e6f28f4f6ac758becf4c7660 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Tue, 24 Aug 2021 18:00:27 +0200
Subject: [PATCH] Update PHP-FPM-74-public.sh

---
 .../tools/apache-fpm-tpl/PHP-FPM-74-public.sh | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh
index 6f6290b1..0ff7b21b 100755
--- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh
+++ b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh
@@ -17,8 +17,8 @@ user = $1
 group = $1
 
 pm = ondemand
-pm.max_children = 16
-request_terminate_timeout = 30s
+pm.max_children = 8
+request_terminate_timeout = 90s
 pm.max_requests = 4000
 pm.process_idle_timeout = 10s
 pm.status_path = /status
@@ -27,7 +27,7 @@ php_admin_value[upload_tmp_dir] = /home/$1/tmp
 php_admin_value[session.save_path] = /home/$1/tmp
 php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube
 php_admin_value[upload_max_filesize] = 80M
-php_admin_value[max_execution_time] = 20
+php_admin_value[max_execution_time] = 30
 php_admin_value[post_max_size] = 80M
 php_admin_value[memory_limit] = 256M
 php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\"
@@ -46,30 +46,36 @@ pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf"
 pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf"
 pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf"
 pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf"
+pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
-    service php5.6-fpm restart
+    systemctl reset-failed php5.6-fpm
+    systemctl restart php5.6-fpm
 fi
 
 if [ -f "$pool_file_70" ]; then
     rm $pool_file_70
-    service php7.0-fpm restart
+    systemctl reset-failed php7.0-fpm
+    systemctl restart php7.0-fpm
 fi
 
 if [ -f "$pool_file_71" ]; then
     rm $pool_file_71
-    service php7.1-fpm restart
+    systemctl reset-failed php7.1-fpm
+    systemctl restart php7.1-fpm
 fi
 
 if [ -f "$pool_file_72" ]; then
     rm $pool_file_72
-    service php7.2-fpm restart
+    systemctl reset-failed php7.2-fpm
+    systemctl restart php7.2-fpm
 fi
 
 if [ -f "$pool_file_73" ]; then
     rm $pool_file_73
-    service php7.3-fpm restart
+    systemctl reset-failed php7.3-fpm
+    systemctl restart php7.3-fpm
 fi
 
 write_file=0
@@ -83,10 +89,17 @@ else
 fi
 if [ $write_file -eq 1 ]; then
     echo "$pool_conf" > $pool_file_74
-    service php7.4-fpm restart
+    systemctl reset-failed php7.4-fpm
+    systemctl restart php7.4-fpm
 fi
 if [ -f "/etc/php/7.4/fpm/pool.d/www.conf" ]; then
     rm /etc/php/7.4/fpm/pool.d/www.conf
 fi
 
-exit 0
\ No newline at end of file
+if [ -f "$pool_file_80" ]; then
+    rm $pool_file_80
+    systemctl reset-failed php8.0-fpm
+    systemctl restart php8.0-fpm
+fi
+
+exit 0