Add PHP7.3 support for multiphp.

install/hst-install-debian.sh

@@ -650,15 +650,16 @@ fi
 if [ "$multiphp" = 'yes' ]; then
     mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
          php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
-         php5.6-soap php5.6-xml php5.6-zip php5.6-zip php7.0-mbstring
-         php7.0-bcmath php7.0-cli php7.0-curl php7.0-fpm php7.0-gd
-         php7.0-intl php7.0-mcrypt php7.0-mysql php7.0-soap php7.0-xml
-         php7.0-zip php7.0-zip php7.1-mbstring php7.1-bcmath php7.1-cli
-         php7.1-curl php7.1-fpm php7.1-gd php7.1-intl php7.1-mcrypt
-         php7.1-mysql php7.1-soap php7.1-xml php7.1-zip php7.1-zip 
+         php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
+         php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
+         php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
+         php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
+         php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip 
          php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
          php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
-         php7.2-zip"
+         php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
+         php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
+         php7.3-zip"
     software="$software $mph"
 fi
 
@@ -906,11 +907,12 @@ if [ "$nginx" = 'yes' ]; then
     cp -f $hestiacp/logrotate/nginx /etc/logrotate.d/
     echo > /etc/nginx/conf.d/hestia.conf
     mkdir -p /var/log/nginx/domains
-    if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ] && [ "$phpfpm" = 'no' ]; then
-        update-rc.d php5.6-fpm defaults
-        update-rc.d php7.0-fpm defaults
-        update-rc.d php7.1-fpm defaults
-        update-rc.d php7.2-fpm defaults
+    if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
+        update-rc.d php5.6-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.0-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.1-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.2-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.3-fpm defaults > /dev/null 2>&1
         cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
         rm -f /etc/php/5.6/fpm/pool.d/*
         cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
@@ -919,6 +921,8 @@ if [ "$nginx" = 'yes' ]; then
         rm -f /etc/php/7.1/fpm/pool.d/*
         cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
         rm -f /etc/php/7.2/fpm/pool.d/*
+        cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
+        rm -f /etc/php/7.3/fpm/pool.d/*
         rm -fr $HESTIA/data/templates/web/nginx/*
         cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
         cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/
@@ -960,17 +964,19 @@ if [ "$apache" = 'yes' ]; then
     chmod a+x /var/log/apache2
     chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log
     chmod 751 /var/log/apache2/domains
-    if [ "$multiphp" = 'yes' ]; then
-        a2enmod proxy_fcgi setenvif
-        a2enconf php5.6-fpm
-        a2enconf php7.0-fpm
-        a2enconf php7.1-fpm
-        a2enconf php7.2-fpm
-        update-rc.d php5.6-fpm defaults
-        update-rc.d php7.0-fpm defaults
-        update-rc.d php7.1-fpm defaults
-        update-rc.d php7.2-fpm defaults
-        cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
+    if [ "$multiphp" = 'yes' ] ; then
+        a2enmod proxy_fcgi setenvif > /dev/null 2>&1
+        a2enconf php5.6-fpm > /dev/null 2>&1
+        a2enconf php7.0-fpm > /dev/null 2>&1
+        a2enconf php7.1-fpm > /dev/null 2>&1
+        a2enconf php7.2-fpm > /dev/null 2>&1
+        a2enconf php7.3-fpm > /dev/null 2>&1
+        update-rc.d php5.6-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.0-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.1-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.2-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.3-fpm defaults > /dev/null 2>&1
+        cp -r /etc/php/5.6/ /root/vst_install_backups/php5.6/
         rm -f /etc/php/5.6/fpm/pool.d/*
         cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
         rm -f /etc/php/7.0/fpm/pool.d/*
@@ -978,6 +984,8 @@ if [ "$apache" = 'yes' ]; then
         rm -f /etc/php/7.1/fpm/pool.d/*
         cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
         rm -f /etc/php/7.2/fpm/pool.d/*
+        cp -r /etc/php/7.3/ /root/vst_install_backups/php7.3/
+        rm -f /etc/php/7.3/fpm/pool.d/*
         cp -f $hestiacp/multiphp/apache2/* $HESTIA/data/templates/web/apache2/
         chmod a+x $HESTIA/data/templates/web/apache2/*.sh
         if [ "$release" = '8' ]; then

install/hst-install-ubuntu.sh

@@ -634,15 +634,16 @@ fi
 if [ "$multiphp" = 'yes' ]; then
     mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
          php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
-         php5.6-soap php5.6-xml php5.6-zip php5.6-zip php7.0-mbstring
-         php7.0-bcmath php7.0-cli php7.0-curl php7.0-fpm php7.0-gd
-         php7.0-intl php7.0-mcrypt php7.0-mysql php7.0-soap php7.0-xml
-         php7.0-zip php7.0-zip php7.1-mbstring php7.1-bcmath php7.1-cli
-         php7.1-curl php7.1-fpm php7.1-gd php7.1-intl php7.1-mcrypt
-         php7.1-mysql php7.1-soap php7.1-xml php7.1-zip php7.1-zip 
+         php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
+         php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
+         php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
+         php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
+         php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip 
          php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
          php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
-         php7.2-zip"
+         php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
+         php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
+         php7.3-zip"
     software="$software $mph"
 fi
 
@@ -896,6 +897,7 @@ if [ "$nginx" = 'yes' ]; then
         update-rc.d php7.0-fpm defaults > /dev/null 2>&1
         update-rc.d php7.1-fpm defaults > /dev/null 2>&1
         update-rc.d php7.2-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.3-fpm defaults > /dev/null 2>&1
         cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
         rm -f /etc/php/5.6/fpm/pool.d/*
         cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
@@ -904,6 +906,8 @@ if [ "$nginx" = 'yes' ]; then
         rm -f /etc/php/7.1/fpm/pool.d/*
         cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
         rm -f /etc/php/7.2/fpm/pool.d/*
+        cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
+        rm -f /etc/php/7.3/fpm/pool.d/*
         rm -fr $HESTIA/data/templates/web/nginx/*
         cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
         cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/
@@ -950,10 +954,12 @@ if [ "$apache" = 'yes'  ]; then
         a2enconf php7.0-fpm > /dev/null 2>&1
         a2enconf php7.1-fpm > /dev/null 2>&1
         a2enconf php7.2-fpm > /dev/null 2>&1
+        a2enconf php7.3-fpm > /dev/null 2>&1
         update-rc.d php5.6-fpm defaults > /dev/null 2>&1
         update-rc.d php7.0-fpm defaults > /dev/null 2>&1
         update-rc.d php7.1-fpm defaults > /dev/null 2>&1
         update-rc.d php7.2-fpm defaults > /dev/null 2>&1
+        update-rc.d php7.3-fpm defaults > /dev/null 2>&1
         cp -r /etc/php/5.6/ /root/vst_install_backups/php5.6/
         rm -f /etc/php/5.6/fpm/pool.d/*
         cp -r /etc/php/7.0/ /root/vst_install_backups/php7.0/
@@ -962,6 +968,8 @@ if [ "$apache" = 'yes'  ]; then
         rm -f /etc/php/7.1/fpm/pool.d/*
         cp -r /etc/php/7.2/ /root/vst_install_backups/php7.2/
         rm -f /etc/php/7.2/fpm/pool.d/*
+        cp -r /etc/php/7.3/ /root/vst_install_backups/php7.3/
+        rm -f /etc/php/7.3/fpm/pool.d/*
         cp -f $hestiacp/multiphp/apache2/* $HESTIA/data/templates/web/apache2/
         chmod a+x $HESTIA/data/templates/web/apache2/*.sh
     fi

install/ubuntu/18.04/multiphp/apache2/PHP-73.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+# Adding php pool conf
+user="$1"
+domain="$2"
+ip="$3"
+home_dir="$4"
+docroot="$5"
+
+pool_conf="[$2]
+
+listen = /run/php/php7.3-fpm-$2.sock
+listen.owner = $1
+listen.group = $1
+listen.mode = 0666
+
+user = $1
+group = $1
+
+pm = ondemand
+pm.max_children = 4
+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"
+
+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
+    echo "$pool_conf" > $pool_file_73
+    service php7.3-fpm restart
+fi
+
+exit 0

install/ubuntu/18.04/multiphp/apache2/PHP-73.stpl

@@ -0,0 +1,44 @@
+<VirtualHost %ip%:%web_ssl_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %sdocroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+    <Directory %sdocroot%>
+        AllowOverride All
+        SSLRequireSSL
+        Options +Includes -Indexes +ExecCGI
+	</Directory>
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile %ssl_crt%
+    SSLCertificateKeyFile %ssl_key%
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+#    <IfModule mod_ruid2.c>
+#        RMode config
+#        RUidGid %user% %group%
+#        RGroups www-data
+#    </IfModule>
+#    <IfModule itk.c>
+#        AssignUserID %user% %group%
+#    </IfModule>
+
+    <FilesMatch \.php$>
+        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
+    </FilesMatch>
+    SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
+
+    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+
+</VirtualHost>
+

install/ubuntu/18.04/multiphp/apache2/PHP-73.tpl

@@ -0,0 +1,38 @@
+<VirtualHost %ip%:%web_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    <Directory %home%/%user%/web/%domain%/stats>
+        AllowOverride All
+    </Directory>
+    <Directory %sdocroot%>
+        AllowOverride All
+        Options +Includes -Indexes +ExecCGI
+    </Directory>
+#    <IfModule mod_ruid2.c>
+#        RMode config
+#        RUidGid %user% %group%
+#        RGroups www-data
+#    </IfModule>
+#    <IfModule itk.c>
+#        AssignUserID %user% %group%
+#    </IfModule>
+
+    <FilesMatch \.php$>
+        SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/"
+    </FilesMatch>
+    SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
+
+    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+
+</VirtualHost>
+

install/ubuntu/18.04/multiphp/nginx/PHP-73.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+# Adding php pool conf
+user="$1"
+domain="$2"
+ip="$3"
+home_dir="$4"
+docroot="$5"
+
+pool_conf="[$2]
+
+listen = /run/php/php7.3-fpm-$2.sock
+listen.owner = $1
+listen.group = $1
+listen.mode = 0666
+
+user = $1
+group = $1
+
+pm = ondemand
+pm.max_children = 4
+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"
+
+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
+    echo "$pool_conf" > $pool_file_73
+    service php7.3-fpm restart
+fi
+
+exit 0

install/ubuntu/18.04/multiphp/nginx/PHP-73.stpl

@@ -0,0 +1,55 @@
+server {
+    listen      %ip%:%web_ssl_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %sdocroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    ssl         on;
+    ssl_certificate      %ssl_pem%;
+    ssl_certificate_key  %ssl_key%;
+
+    location / {
+
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+
+        location ~ [^/]\.php(/|$) {
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            if (!-f $document_root$fastcgi_script_name) {
+                return  404;
+            }
+
+            fastcgi_pass    unix:/run/php/php7.3-fpm-%domain%.sock;
+            fastcgi_index   index.php;
+            include         /etc/nginx/fastcgi_params;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/conf/web/%domain%.auth*;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+}

install/ubuntu/18.04/multiphp/nginx/PHP-73.tpl

@@ -0,0 +1,51 @@
+server {
+    listen      %ip%:%web_port%;
+    server_name %domain_idn% %alias_idn%;
+    root        %docroot%;
+    index       index.php index.html index.htm;
+    access_log  /var/log/nginx/domains/%domain%.log combined;
+    access_log  /var/log/nginx/domains/%domain%.bytes bytes;
+    error_log   /var/log/nginx/domains/%domain%.error.log error;
+
+    location / {
+
+        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+            expires     max;
+        }
+
+        location ~ [^/]\.php(/|$) {
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            if (!-f $document_root$fastcgi_script_name) {
+                return  404;
+            }
+
+            fastcgi_pass    unix:/run/php/php7.3-fpm-%domain%.sock;
+            fastcgi_index   index.php;
+            include         /etc/nginx/fastcgi_params;
+        }
+    }
+
+    error_page  403 /error/404.html;
+    error_page  404 /error/404.html;
+    error_page  500 502 503 504 /error/50x.html;
+
+    location /error/ {
+        alias   %home%/%user%/web/%domain%/document_errors/;
+    }
+
+    location ~* "/\.(htaccess|htpasswd)$" {
+        deny    all;
+        return  404;
+    }
+
+    location /vstats/ {
+        alias   %home%/%user%/web/%domain%/stats/;
+        include %home%/%user%/conf/web/%domain%.auth*;
+    }
+
+    include     /etc/nginx/conf.d/phpmyadmin.inc*;
+    include     /etc/nginx/conf.d/phppgadmin.inc*;
+    include     /etc/nginx/conf.d/webmail.inc*;
+
+    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+}