do not exclude php packages when selecting phpfpm

install/hst-install-debian.sh

@@ -41,10 +41,14 @@ if [ "$release" -eq 8 ]; then
         unrar-free vim-common acl sysstat setpriv"
 elif [ "$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-pgsql php-imap php-ldap php-apcu
-        awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
-        clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
+        libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php$fpm_v 
+        php$fpm_v php$fpm_v-common php$fpm_v-cgi php$fpm_v-mysql php$fpm_v-curl
+        php$fpm_v-pgsql php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu awstats
+        php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli php$fpm_v-common php$fpm_v-gd
+        php$fpm_v-intl php$fpm_v-json php$fpm_v-zip php$fpm_v-mbstring
+        php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline php$fpm_v-xml
+        vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
+        spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
         roundcube-mysql roundcube-plugins mariadb-client mariadb-common
         mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
         flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
@@ -790,66 +794,36 @@ if [ "$dovecot" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/roundcube-plugins//")
 fi
 if [ "$mysql" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/mariadb-server//')
-    software=$(echo "$software" | sed -e 's/mariadb-client//')
-    software=$(echo "$software" | sed -e 's/mariadb-common//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
+    software=$(echo "$software" | sed -e "s/mariadb-server//")
+    software=$(echo "$software" | sed -e "s/mariadb-client//")
+    software=$(echo "$software" | sed -e "s/mariadb-common//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
     if [ "$multiphp" = 'yes' ]; then
         for v in "${multiphp_v[@]}"; do
             software=$(echo "$software" | sed -e "s/php$v-mysql//")
             software=$(echo "$software" | sed -e "s/php$v-bz2//")
         done
     fi
-    if [ "$phpfpm" = 'yes' ]; then
-        software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
-    fi
-    software=$(echo "$software" | sed -e 's/phpmyadmin//')
+    software=$(echo "$software" | sed -e "s/phpmyadmin//")
 fi
 if [ "$postgresql" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/postgresql-contrib//')
-    software=$(echo "$software" | sed -e 's/postgresql//')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
+    software=$(echo "$software" | sed -e "s/postgresql-contrib//")
+    software=$(echo "$software" | sed -e "s/postgresql//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
     if [ "$multiphp" = 'yes' ]; then
         for v in "${multiphp_v[@]}"; do
             software=$(echo "$software" | sed -e "s/php$v-pgsql//")
         done
     fi
-    if [ "$phpfpm" = 'yes' ]; then
-        software=$(echo "$software" | sed -e "s/php$v-pgsql//")
-    fi
-    software=$(echo "$software" | sed -e 's/phppgadmin//')
+    software=$(echo "$software" | sed -e "s/phppgadmin//")
 fi
 if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/fail2ban//')
-fi
-if [ "$phpfpm" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/ php //')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
-    software=$(echo "$software" | sed -e 's/php-curl//')
-    software=$(echo "$software" | sed -e 's/php-common//')
-    software=$(echo "$software" | sed -e 's/php-cgi//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
-fi
-if [ "$multiphp" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/ php //')
-    software=$(echo "$software" | sed -e 's/php-auth-sasl//')
-    software=$(echo "$software" | sed -e 's/php-cgi//')
-    software=$(echo "$software" | sed -e 's/php-common//')
-    software=$(echo "$software" | sed -e 's/php-curl//')
-    software=$(echo "$software" | sed -e 's/php-mail-mime//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
-    software=$(echo "$software" | sed -e 's/php-net-sieve//')
-    software=$(echo "$software" | sed -e 's/php-net-smtp//')
-    software=$(echo "$software" | sed -e 's/php-net-socket//')
-    software=$(echo "$software" | sed -e 's/php-pear//')
-    software=$(echo "$software" | sed -e 's/php-php-gettext//')
-    software=$(echo "$software" | sed -e 's/php-phpseclib//')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
+    software=$(echo "$software" | sed -e "s/fail2ban//")
 fi
 if [ -d "$withdebs" ]; then
-    software=$(echo "$software" | sed -e 's/hestia-nginx//')
-    software=$(echo "$software" | sed -e 's/hestia-php//')
-    software=$(echo "$software" | sed -e 's/hestia//')
+    software=$(echo "$software" | sed -e "s/hestia-nginx//")
+    software=$(echo "$software" | sed -e "s/hestia-php//")
+    software=$(echo "$software" | sed -e "s/hestia//")
 fi
 
 #----------------------------------------------------------#
@@ -1854,11 +1828,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
 echo "(!) IMPORTANT: You must logout or restart the server before continuing."
 echo ""
 if [ "$interactive" = 'yes' ]; then
-    echo -n " Do you want to reboot now? [Y/N] "
+    echo -n " Do you want to logout now? [Y/N] "
     read resetshell
 
     if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
-        reboot
+        exit
     fi
 fi
 

install/hst-install-ubuntu.sh

@@ -31,10 +31,14 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon
     cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4
     exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
-    libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
-    libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server nginx
-    ntpdate php php-cgi php-common php-curl phpmyadmin php-mysql php-imap php-ldap
-    php-apcu phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
+    libapache2-mod-fcgid libapache2-mod-php$fpm_v libapache2-mod-rpaf
+    libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server
+    nginx  ntpdate php$fpm_v php$fpm_v-cgi php$fpm_v-common php$fpm_v-curl
+    phpmyadmin php$fpm_v-mysql php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu 
+    phppgadmin php$fpm_v-pgsql php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli
+    php$fpm_v-common php$fpm_v-gd php$fpm_v-intl php$fpm_v-json php$fpm_v-zip 
+    php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline
+    php$fpm_v-xml postgresql postgresql-contrib proftpd-basic quota
     roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
     sudo hestia hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv"
 
@@ -707,7 +711,7 @@ if [ "$apache" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
     software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
-    software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
+    software=$(echo "$software" | sed -e "s/libapache2-mod-php$fpm_v//")
 fi
 if [ "$vsftpd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -744,66 +748,36 @@ if [ "$dovecot" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/roundcube-plugins//")
 fi
 if [ "$mysql" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/mariadb-server//')
-    software=$(echo "$software" | sed -e 's/mariadb-client//')
-    software=$(echo "$software" | sed -e 's/mariadb-common//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
+    software=$(echo "$software" | sed -e "s/mariadb-server//")
+    software=$(echo "$software" | sed -e "s/mariadb-client//")
+    software=$(echo "$software" | sed -e "s/mariadb-common//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
     if [ "$multiphp" = 'yes' ]; then
         for v in "${multiphp_v[@]}"; do
             software=$(echo "$software" | sed -e "s/php$v-mysql//")
             software=$(echo "$software" | sed -e "s/php$v-bz2//")
         done
     fi
-    if [ "$phpfpm" = 'yes' ]; then
-        software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
-    fi
-    software=$(echo "$software" | sed -e 's/phpmyadmin//')
+    software=$(echo "$software" | sed -e "s/phpmyadmin//")
 fi
 if [ "$postgresql" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/postgresql-contrib//')
-    software=$(echo "$software" | sed -e 's/postgresql//')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
+    software=$(echo "$software" | sed -e "s/postgresql-contrib//")
+    software=$(echo "$software" | sed -e "s/postgresql//")
+    software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
     if [ "$multiphp" = 'yes' ]; then
         for v in "${multiphp_v[@]}"; do
             software=$(echo "$software" | sed -e "s/php$v-pgsql//")
         done
     fi
-    if [ "$phpfpm" = 'yes' ]; then
-        software=$(echo "$software" | sed -e "s/php$v-pgsql//")
-    fi
-    software=$(echo "$software" | sed -e 's/phppgadmin//')
+    software=$(echo "$software" | sed -e "s/phppgadmin//")
 fi
 if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
-    software=$(echo "$software" | sed -e 's/fail2ban//')
-fi
-if [ "$phpfpm" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/ php //')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
-    software=$(echo "$software" | sed -e 's/php-curl//')
-    software=$(echo "$software" | sed -e 's/php-common//')
-    software=$(echo "$software" | sed -e 's/php-cgi//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
-fi
-if [ "$multiphp" = 'yes' ]; then
-    software=$(echo "$software" | sed -e 's/ php //')
-    software=$(echo "$software" | sed -e 's/php-auth-sasl//')
-    software=$(echo "$software" | sed -e 's/php-cgi//')
-    software=$(echo "$software" | sed -e 's/php-common//')
-    software=$(echo "$software" | sed -e 's/php-curl//')
-    software=$(echo "$software" | sed -e 's/php-mail-mime//')
-    software=$(echo "$software" | sed -e 's/php-mysql//')
-    software=$(echo "$software" | sed -e 's/php-net-sieve//')
-    software=$(echo "$software" | sed -e 's/php-net-smtp//')
-    software=$(echo "$software" | sed -e 's/php-net-socket//')
-    software=$(echo "$software" | sed -e 's/php-pear//')
-    software=$(echo "$software" | sed -e 's/php-php-gettext//')
-    software=$(echo "$software" | sed -e 's/php-phpseclib//')
-    software=$(echo "$software" | sed -e 's/php-pgsql//')
+    software=$(echo "$software" | sed -e "s/fail2ban//")
 fi
 if [ -d "$withdebs" ]; then
-    software=$(echo "$software" | sed -e 's/hestia-nginx//')
-    software=$(echo "$software" | sed -e 's/hestia-php//')
-    software=$(echo "$software" | sed -e 's/hestia//')
+    software=$(echo "$software" | sed -e "s/hestia-nginx//")
+    software=$(echo "$software" | sed -e "s/hestia-php//")
+    software=$(echo "$software" | sed -e "s/hestia//")
 fi
 
 #----------------------------------------------------------#
@@ -1773,11 +1747,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
 echo "(!) IMPORTANT: You must logout or restart the server before continuing."
 echo ""
 if [ "$interactive" = 'yes' ]; then
-    echo -n " Do you want to reboot now? [Y/N] "
+    echo -n " Do you want to logout now? [Y/N] "
     read resetshell
 
     if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
-        reboot
+        exit
     fi
 fi