Set PHP-FPM to v7.2 as default.

install/hst-install-debian.sh

@@ -21,20 +21,20 @@ hestiacp="$HESTIA/install/$VERSION/$release"
 if [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
         libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
-        php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats
-        webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
-        clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
+        php-common php-cgi php-mysql php-curl php-pgsql awstats webalizer
+        vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon 
+        spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
         roundcube-mysql roundcube-plugins mysql-server mysql-common
         mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
-        unrar-free vim-common net-tools"
-elif [ "$release" -eq 8 ]; then
+        unrar-free vim-common"
+else
     software="nginx apache2 apache2-utils apache2.2-common
         apache2-suexec-custom libapache2-mod-ruid2
         libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
-        php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
+        php5-mysql php5-curl php5-pgsql awstats webalizer vsftpd net-tools
         proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
         spamassassin dovecot-imapd dovecot-pop3d roundcube-core
         roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -42,20 +42,7 @@ elif [ "$release" -eq 8 ]; then
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
         e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
         bsdmainutils cron hestia hestia-nginx hestia-php expect libmail-dkim-perl
-        unrar-free vim-common net-tools"
-else
-    software="nginx apache2 apache2-utils apache2.2-common
-        apache2-suexec-custom libapache2-mod-ruid2
-        libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
-        php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd
-        proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy
-        clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core
-        roundcube-mysql roundcube-plugins mysql-server mysql-common
-        mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc
-        flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
-        e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
-        bsdmainutils cron hestia hestia-nginx hestia-php expect unrar-free
-        vim-common net-tools"
+        unrar-free vim-common"
 fi
 
 # Defining help function
@@ -252,6 +239,9 @@ if [ "$phpfpm" = 'yes' ]; then
     apache='no'
     nginx='yes'
 fi
+if [ "$multiphp" = 'yes' ]; then
+    phpfpm='no'
+fi
 if [ "$proftpd" = 'yes' ]; then
     vsftpd='no'
 fi
@@ -646,24 +636,22 @@ 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-memcache php5.6-memcached
-         php5.6-zip php7.0-apcu 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-memcache
-         php7.0-memcached php7.0-zip php7.1-apcu 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-memcache php7.1-memcached php7.1-zip 
-         php7.2-apcu 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-memcache php7.2-memcached php7.2-zip"
+         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 
+         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"
     software="$software $mph"
 fi
 
 if [ "$phpfpm" = 'yes' ]; then
-    fpm="php7.2-apcu 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-memcache php7.2-memcached php7.2-zip"
+    fpm="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"
     software="$software $fpm"
 fi
 
@@ -918,10 +906,13 @@ if [ "$nginx" = 'yes' ]; then
         rm -f /etc/php/7.2/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/
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.sh $HESTIA/data/templates/web/nginx/default.sh
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.tpl $HESTIA/data/templates/web/nginx/default.tpl
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.stpl $HESTIA/data/templates/web/nginx/default.stpl
         chmod a+x $HESTIA/data/templates/web/nginx/*.sh
+        service php7.2-fpm start
+        check_result $? "php7.2-fpm start failed"
     fi
     update-rc.d nginx defaults
     service nginx start

install/hst-install-ubuntu.sh

@@ -25,17 +25,10 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
     libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
     libapache2-mod-ruid2 lsof mc mysql-client mysql-common mysql-server nginx
-    ntpdate php-cgi php-common php-curl php-fpm phpmyadmin php-mysql
-    phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
-    roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
-    sudo hestia hestia-nginx hestia-php vim-common vsftpd webalizer whois zip"
-
-# Fix for old releases
-if [[ ${release:0:2} -lt 16 ]]; then
-    software=$(echo "$software" |sed -e "s/php /php5 /g")
-    software=$(echo "$software" |sed -e "s/hestia-php5 /hestia-php /g")
-    software=$(echo "$software" |sed -e "s/php-/php5-/g")
-fi
+    ntpdate php-cgi php-common php-curl phpmyadmin php-mysql phppgadmin
+    php-pgsql postgresql postgresql-contrib proftpd-basic quota roundcube-core
+    roundcube-mysql roundcube-plugins rrdtool rssh spamassassin sudo hestia
+    hestia-nginx hestia-php vim-common vsftpd webalizer whois zip"
 
 # Defining help function
 help() {
@@ -230,6 +223,9 @@ if [ "$phpfpm" = 'yes' ]; then
     apache='no'
     nginx='yes'
 fi
+if [ "$multiphp" = 'yes' ]; then
+    phpfpm='no'
+fi
 if [ "$proftpd" = 'yes' ]; then
     vsftpd='no'
 fi
@@ -645,20 +641,25 @@ 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-memcache php5.6-memcached
-         php5.6-zip php7.0-apcu 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-memcache
-         php7.0-memcached php7.0-zip php7.1-apcu 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-memcache php7.1-memcached php7.1-zip 
-         php7.2-apcu 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-memcache php7.2-memcached php7.2-zip"
+         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 
+         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"
     software="$software $mph"
 fi
 
+if [ "$phpfpm" = 'yes' ]; then
+    fpm="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"
+    software="$software $fpm"
+fi
+
 #----------------------------------------------------------#
 #                     Install packages                     #
 #----------------------------------------------------------#
@@ -897,7 +898,7 @@ 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
+    if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
         update-rc.d php5.6-fpm defaults
         update-rc.d php7.0-fpm defaults
         update-rc.d php7.1-fpm defaults
@@ -912,10 +913,13 @@ if [ "$nginx" = 'yes' ]; then
         rm -f /etc/php/7.2/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/
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.sh $HESTIA/data/templates/web/nginx/default.sh
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.tpl $HESTIA/data/templates/web/nginx/default.tpl
         ln -s $HESTIA/data/templates/web/nginx/PHP-72.stpl $HESTIA/data/templates/web/nginx/default.stpl
         chmod a+x $HESTIA/data/templates/web/nginx/*.sh
+        service php7.2-fpm start
+        check_result $? "php7.2-fpm start failed"
     fi
     update-rc.d nginx defaults
     service nginx start
@@ -982,7 +986,6 @@ fi
 #----------------------------------------------------------#
 
 if [ "$phpfpm" = 'yes' ]; then
-    pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \))
     cp -f $hestiacp/php-fpm/www.conf $pool/
     php_fpm=$(ls /etc/init.d/php*-fpm* |cut -f 4 -d /)
     ln -s /etc/init.d/$php_fpm /etc/init.d/php-fpm > /dev/null 2>&1

install/ubuntu/18.04/php-fpm/www.conf

@@ -8,4 +8,4 @@ group = www-data
 pm = ondemand
 pm.max_children = 2
 pm.max_requests = 4000
-pm.process_idle_timeout = 10s
+pm.process_idle_timeout = 10s