Skip to content

Commit 40ae239

Browse files
LupulLupul
committed
do not exclude php packages when selecting phpfpm
1 parent 1e33ba1 commit 40ae239

File tree

2 files changed

+47
-99
lines changed

2 files changed

+47
-99
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 23 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,14 @@ if [ "$release" -eq 8 ]; then
4141
unrar-free vim-common acl sysstat setpriv"
4242
elif [ "$release" -eq 9 ]; then
4343
software="nginx apache2 apache2-utils apache2-suexec-custom
44-
libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
45-
php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
46-
awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
47-
clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
44+
libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php$fpm_v
45+
php$fpm_v php$fpm_v-common php$fpm_v-cgi php$fpm_v-mysql php$fpm_v-curl
46+
php$fpm_v-pgsql php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu awstats
47+
php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli php$fpm_v-common php$fpm_v-gd
48+
php$fpm_v-intl php$fpm_v-json php$fpm_v-zip php$fpm_v-mbstring
49+
php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline php$fpm_v-xml
50+
vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
51+
spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
4852
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
4953
mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
5054
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
@@ -790,66 +794,36 @@ if [ "$dovecot" = 'no' ]; then
790794
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
791795
fi
792796
if [ "$mysql" = 'no' ]; then
793-
software=$(echo "$software" | sed -e 's/mariadb-server//')
794-
software=$(echo "$software" | sed -e 's/mariadb-client//')
795-
software=$(echo "$software" | sed -e 's/mariadb-common//')
796-
software=$(echo "$software" | sed -e 's/php-mysql//')
797+
software=$(echo "$software" | sed -e "s/mariadb-server//")
798+
software=$(echo "$software" | sed -e "s/mariadb-client//")
799+
software=$(echo "$software" | sed -e "s/mariadb-common//")
800+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
797801
if [ "$multiphp" = 'yes' ]; then
798802
for v in "${multiphp_v[@]}"; do
799803
software=$(echo "$software" | sed -e "s/php$v-mysql//")
800804
software=$(echo "$software" | sed -e "s/php$v-bz2//")
801805
done
802806
fi
803-
if [ "$phpfpm" = 'yes' ]; then
804-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
805-
fi
806-
software=$(echo "$software" | sed -e 's/phpmyadmin//')
807+
software=$(echo "$software" | sed -e "s/phpmyadmin//")
807808
fi
808809
if [ "$postgresql" = 'no' ]; then
809-
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
810-
software=$(echo "$software" | sed -e 's/postgresql//')
811-
software=$(echo "$software" | sed -e 's/php-pgsql//')
810+
software=$(echo "$software" | sed -e "s/postgresql-contrib//")
811+
software=$(echo "$software" | sed -e "s/postgresql//")
812+
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
812813
if [ "$multiphp" = 'yes' ]; then
813814
for v in "${multiphp_v[@]}"; do
814815
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
815816
done
816817
fi
817-
if [ "$phpfpm" = 'yes' ]; then
818-
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
819-
fi
820-
software=$(echo "$software" | sed -e 's/phppgadmin//')
818+
software=$(echo "$software" | sed -e "s/phppgadmin//")
821819
fi
822820
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
823-
software=$(echo "$software" | sed -e 's/fail2ban//')
824-
fi
825-
if [ "$phpfpm" = 'yes' ]; then
826-
software=$(echo "$software" | sed -e 's/ php //')
827-
software=$(echo "$software" | sed -e 's/php-pgsql//')
828-
software=$(echo "$software" | sed -e 's/php-curl//')
829-
software=$(echo "$software" | sed -e 's/php-common//')
830-
software=$(echo "$software" | sed -e 's/php-cgi//')
831-
software=$(echo "$software" | sed -e 's/php-mysql//')
832-
fi
833-
if [ "$multiphp" = 'yes' ]; then
834-
software=$(echo "$software" | sed -e 's/ php //')
835-
software=$(echo "$software" | sed -e 's/php-auth-sasl//')
836-
software=$(echo "$software" | sed -e 's/php-cgi//')
837-
software=$(echo "$software" | sed -e 's/php-common//')
838-
software=$(echo "$software" | sed -e 's/php-curl//')
839-
software=$(echo "$software" | sed -e 's/php-mail-mime//')
840-
software=$(echo "$software" | sed -e 's/php-mysql//')
841-
software=$(echo "$software" | sed -e 's/php-net-sieve//')
842-
software=$(echo "$software" | sed -e 's/php-net-smtp//')
843-
software=$(echo "$software" | sed -e 's/php-net-socket//')
844-
software=$(echo "$software" | sed -e 's/php-pear//')
845-
software=$(echo "$software" | sed -e 's/php-php-gettext//')
846-
software=$(echo "$software" | sed -e 's/php-phpseclib//')
847-
software=$(echo "$software" | sed -e 's/php-pgsql//')
821+
software=$(echo "$software" | sed -e "s/fail2ban//")
848822
fi
849823
if [ -d "$withdebs" ]; then
850-
software=$(echo "$software" | sed -e 's/hestia-nginx//')
851-
software=$(echo "$software" | sed -e 's/hestia-php//')
852-
software=$(echo "$software" | sed -e 's/hestia//')
824+
software=$(echo "$software" | sed -e "s/hestia-nginx//")
825+
software=$(echo "$software" | sed -e "s/hestia-php//")
826+
software=$(echo "$software" | sed -e "s/hestia//")
853827
fi
854828

855829
#----------------------------------------------------------#
@@ -1854,11 +1828,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
18541828
echo "(!) IMPORTANT: You must logout or restart the server before continuing."
18551829
echo ""
18561830
if [ "$interactive" = 'yes' ]; then
1857-
echo -n " Do you want to reboot now? [Y/N] "
1831+
echo -n " Do you want to logout now? [Y/N] "
18581832
read resetshell
18591833

18601834
if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
1861-
reboot
1835+
exit
18621836
fi
18631837
fi
18641838

‎install/hst-install-ubuntu.sh‎

Lines changed: 24 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
3131
apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon
3232
cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4
3333
exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
34-
libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
35-
libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server nginx
36-
ntpdate php php-cgi php-common php-curl phpmyadmin php-mysql php-imap php-ldap
37-
php-apcu phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
34+
libapache2-mod-fcgid libapache2-mod-php$fpm_v libapache2-mod-rpaf
35+
libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server
36+
nginx ntpdate php$fpm_v php$fpm_v-cgi php$fpm_v-common php$fpm_v-curl
37+
phpmyadmin php$fpm_v-mysql php$fpm_v-imap php$fpm_v-ldap php$fpm_v-apcu
38+
phppgadmin php$fpm_v-pgsql php$fpm_v-zip php$fpm_v-bz2 php$fpm_v-cli
39+
php$fpm_v-common php$fpm_v-gd php$fpm_v-intl php$fpm_v-json php$fpm_v-zip
40+
php$fpm_v-mbstring php$fpm_v-opcache php$fpm_v-pspell php$fpm_v-readline
41+
php$fpm_v-xml postgresql postgresql-contrib proftpd-basic quota
3842
roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
3943
sudo hestia hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv"
4044

@@ -707,7 +711,7 @@ if [ "$apache" = 'no' ]; then
707711
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
708712
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
709713
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
710-
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
714+
software=$(echo "$software" | sed -e "s/libapache2-mod-php$fpm_v//")
711715
fi
712716
if [ "$vsftpd" = 'no' ]; then
713717
software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -744,66 +748,36 @@ if [ "$dovecot" = 'no' ]; then
744748
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
745749
fi
746750
if [ "$mysql" = 'no' ]; then
747-
software=$(echo "$software" | sed -e 's/mariadb-server//')
748-
software=$(echo "$software" | sed -e 's/mariadb-client//')
749-
software=$(echo "$software" | sed -e 's/mariadb-common//')
750-
software=$(echo "$software" | sed -e 's/php-mysql//')
751+
software=$(echo "$software" | sed -e "s/mariadb-server//")
752+
software=$(echo "$software" | sed -e "s/mariadb-client//")
753+
software=$(echo "$software" | sed -e "s/mariadb-common//")
754+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
751755
if [ "$multiphp" = 'yes' ]; then
752756
for v in "${multiphp_v[@]}"; do
753757
software=$(echo "$software" | sed -e "s/php$v-mysql//")
754758
software=$(echo "$software" | sed -e "s/php$v-bz2//")
755759
done
756760
fi
757-
if [ "$phpfpm" = 'yes' ]; then
758-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
759-
fi
760-
software=$(echo "$software" | sed -e 's/phpmyadmin//')
761+
software=$(echo "$software" | sed -e "s/phpmyadmin//")
761762
fi
762763
if [ "$postgresql" = 'no' ]; then
763-
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
764-
software=$(echo "$software" | sed -e 's/postgresql//')
765-
software=$(echo "$software" | sed -e 's/php-pgsql//')
764+
software=$(echo "$software" | sed -e "s/postgresql-contrib//")
765+
software=$(echo "$software" | sed -e "s/postgresql//")
766+
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
766767
if [ "$multiphp" = 'yes' ]; then
767768
for v in "${multiphp_v[@]}"; do
768769
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
769770
done
770771
fi
771-
if [ "$phpfpm" = 'yes' ]; then
772-
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
773-
fi
774-
software=$(echo "$software" | sed -e 's/phppgadmin//')
772+
software=$(echo "$software" | sed -e "s/phppgadmin//")
775773
fi
776774
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
777-
software=$(echo "$software" | sed -e 's/fail2ban//')
778-
fi
779-
if [ "$phpfpm" = 'yes' ]; then
780-
software=$(echo "$software" | sed -e 's/ php //')
781-
software=$(echo "$software" | sed -e 's/php-pgsql//')
782-
software=$(echo "$software" | sed -e 's/php-curl//')
783-
software=$(echo "$software" | sed -e 's/php-common//')
784-
software=$(echo "$software" | sed -e 's/php-cgi//')
785-
software=$(echo "$software" | sed -e 's/php-mysql//')
786-
fi
787-
if [ "$multiphp" = 'yes' ]; then
788-
software=$(echo "$software" | sed -e 's/ php //')
789-
software=$(echo "$software" | sed -e 's/php-auth-sasl//')
790-
software=$(echo "$software" | sed -e 's/php-cgi//')
791-
software=$(echo "$software" | sed -e 's/php-common//')
792-
software=$(echo "$software" | sed -e 's/php-curl//')
793-
software=$(echo "$software" | sed -e 's/php-mail-mime//')
794-
software=$(echo "$software" | sed -e 's/php-mysql//')
795-
software=$(echo "$software" | sed -e 's/php-net-sieve//')
796-
software=$(echo "$software" | sed -e 's/php-net-smtp//')
797-
software=$(echo "$software" | sed -e 's/php-net-socket//')
798-
software=$(echo "$software" | sed -e 's/php-pear//')
799-
software=$(echo "$software" | sed -e 's/php-php-gettext//')
800-
software=$(echo "$software" | sed -e 's/php-phpseclib//')
801-
software=$(echo "$software" | sed -e 's/php-pgsql//')
775+
software=$(echo "$software" | sed -e "s/fail2ban//")
802776
fi
803777
if [ -d "$withdebs" ]; then
804-
software=$(echo "$software" | sed -e 's/hestia-nginx//')
805-
software=$(echo "$software" | sed -e 's/hestia-php//')
806-
software=$(echo "$software" | sed -e 's/hestia//')
778+
software=$(echo "$software" | sed -e "s/hestia-nginx//")
779+
software=$(echo "$software" | sed -e "s/hestia-php//")
780+
software=$(echo "$software" | sed -e "s/hestia//")
807781
fi
808782

809783
#----------------------------------------------------------#
@@ -1773,11 +1747,11 @@ $HESTIA/bin/v-add-user-notification admin 'Welcome!' 'For more information on ho
17731747
echo "(!) IMPORTANT: You must logout or restart the server before continuing."
17741748
echo ""
17751749
if [ "$interactive" = 'yes' ]; then
1776-
echo -n " Do you want to reboot now? [Y/N] "
1750+
echo -n " Do you want to logout now? [Y/N] "
17771751
read resetshell
17781752

17791753
if [ "$resetshell" = "Y" ] || [ "$resetshell" = "y" ]; then
1780-
reboot
1754+
exit
17811755
fi
17821756
fi
17831757

0 commit comments

Comments
 (0)