Add support PHP8.1 (hestiacp#2233)

* Add support for PHP-8.1

* Add support for php 8.1

* Update /edit/server/index.php with php version

* Add support for tests

Author: jaapmarcus

README.md

@@ -19,7 +19,7 @@ Hestia Control Panel is designed to provide administrators an easy to use web an
 Features and Services
 ----------------------------
 * Apache2 and NGINX with PHP-FPM
-* Multiple PHP versions (5.6 - 8.0, 7.4 as default)
+* Multiple PHP versions (5.6 - 8.1, 8.0 as default)
 * DNS Server (Bind) with clustering capabilities
 * POP/IMAP/SMTP mail services with Anti-Virus, Anti-Spam, and Webmail (ClamAV, SpamAssassin, Roundcube, Rainloop)
 * MariaDB and/or PostgreSQL databases

bin/v-restart-service

@@ -69,6 +69,7 @@ for service in $service_list; do
             "$service" = "php7.3-fpm" -o \
             "$service" = "php7.4-fpm" -o \
             "$service" = "php8.0-fpm" -o \
+            "$service" = "php8.1-fpm" -o \
             "$service" = "proftpd" -o    \
             "$service" = "ssh" -o       \
             "$service" = "fail2ban" ]; then

install/deb/multiphp/apache2/PHP-56.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ ! -f "$pool_file_56" ]; then
     echo "$pool_conf" > $pool_file_56
@@ -82,4 +83,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-70.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -82,4 +83,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-71.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -82,4 +83,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-72.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -82,4 +83,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-73.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -82,4 +83,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-74.sh

@@ -46,6 +46,8 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
+
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -82,4 +84,9 @@ if [ -f "$pool_file_80" ]; then
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-80.sh

@@ -46,6 +46,7 @@ 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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
 
 if [ -f "$pool_file_56" ]; then
     rm $pool_file_56
@@ -72,14 +73,19 @@ if [ -f "$pool_file_73" ]; then
     service php7.3-fpm restart
 fi
 
-if [ ! -f "$pool_file_74" ]; then
-    echo "$pool_conf" > $pool_file_74
+if [ -f "$pool_file_74" ]; then
+    rm $pool_file_74
     service php7.4-fpm restart
 fi
 
-if [ -f "$pool_file_80" ]; then
+if [ ! -f "$pool_file_80" ]; then
     echo "$pool_conf" > $pool_file_80
     service php8.0-fpm restart
 fi
 
+if [ -f "$pool_file_81" ]; then
+    rm $pool_file_81
+    service php8.1-fpm restart
+fi
+
 exit 0

install/deb/multiphp/apache2/PHP-81.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+# Adding php pool conf
+user="$1"
+domain="$2"
+ip="$3"
+home_dir="$4"
+docroot="$5"
+
+pool_conf="[$2]
+
+listen = /run/php/php8.0-fpm-$2.sock
+listen.owner = $1
+listen.group = www-data
+listen.mode = 0660
+
+user = $1
+group = $1
+
+pm = ondemand
+pm.max_children = 8
+pm.max_requests = 4000
+pm.process_idle_timeout = 10s
+pm.status_path = /status
+
+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:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail
+php_admin_value[upload_max_filesize] = 80M
+php_admin_value[max_execution_time] = 20
+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
+php_admin_flag[mysql.allow_persistent] = off
+php_admin_flag[safe_mode] = off
+
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+env[TMP] = /home/$1/tmp
+env[TMPDIR] = /home/$1/tmp
+env[TEMP] = /home/$1/tmp
+"
+
+pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf"
+pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf"
+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"
+pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf"
+
+if [ -f "$pool_file_56" ]; then
+    rm $pool_file_56
+    service php5.6-fpm restart
+fi
+
+if [ -f "$pool_file_70" ]; then
+    rm $pool_file_70
+    service php7.0-fpm restart
+fi
+
+if [ -f "$pool_file_71" ]; then
+    rm $pool_file_71
+    service php7.1-fpm restart
+fi
+
+if [ -f "$pool_file_72" ]; then
+    rm $pool_file_72
+    service php7.2-fpm restart
+fi
+
+if [ -f "$pool_file_73" ]; then
+    rm $pool_file_73
+    service php7.3-fpm restart
+fi
+
+if [ ! -f "$pool_file_74" ]; then
+    rm $pool_file_74
+    service php7.4-fpm restart
+fi
+
+if [ -f "$pool_file_80" ]; then
+    rm $pool_file_80
+    service php8.0-fpm restart
+fi
+
+if [ -f "$pool_file_81" ]; then
+    echo "$pool_conf" > $pool_file_81
+    service php8.1-fpm restart
+fi
+
+exit 0