Skip to content

Commit 1e33ba1

Browse files
ScIT-RaphaelScIT-Raphael
committed
Revert "Ensure default PHP version is set correctly for all installation types"
This reverts commit 0b4c0dc.
1 parent 9dc700d commit 1e33ba1

File tree

2 files changed

+87
-83
lines changed

2 files changed

+87
-83
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,10 @@ 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$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
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
5248
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
5349
mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
5450
flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
@@ -794,60 +790,66 @@ if [ "$dovecot" = 'no' ]; then
794790
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
795791
fi
796792
if [ "$mysql" = 'no' ]; then
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//")
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//')
801797
if [ "$multiphp" = 'yes' ]; then
802798
for v in "${multiphp_v[@]}"; do
803799
software=$(echo "$software" | sed -e "s/php$v-mysql//")
804800
software=$(echo "$software" | sed -e "s/php$v-bz2//")
805801
done
806802
fi
807-
software=$(echo "$software" | sed -e "s/phpmyadmin//")
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//')
808807
fi
809808
if [ "$postgresql" = 'no' ]; then
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//")
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//')
813812
if [ "$multiphp" = 'yes' ]; then
814813
for v in "${multiphp_v[@]}"; do
815814
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
816815
done
817816
fi
818-
software=$(echo "$software" | sed -e "s/phppgadmin//")
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//')
819821
fi
820822
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
821-
software=$(echo "$software" | sed -e "s/fail2ban//")
823+
software=$(echo "$software" | sed -e 's/fail2ban//')
822824
fi
823825
if [ "$phpfpm" = 'yes' ]; then
824-
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
825-
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
826-
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
827-
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
828-
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
829-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
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//')
830832
fi
831833
if [ "$multiphp" = 'yes' ]; then
832-
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
833-
software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
834-
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
835-
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
836-
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
837-
software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
838-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
839-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
840-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
841-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
842-
software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
843-
software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
844-
software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
845-
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
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//')
846848
fi
847849
if [ -d "$withdebs" ]; then
848-
software=$(echo "$software" | sed -e "s/hestia-nginx//")
849-
software=$(echo "$software" | sed -e "s/hestia-php//")
850-
software=$(echo "$software" | sed -e "s/hestia//")
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//')
851853
fi
852854

853855
#----------------------------------------------------------#

‎install/hst-install-ubuntu.sh‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@ 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$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
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
4238
roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin
4339
sudo hestia hestia-nginx hestia-php vim-common vsftpd whois zip acl sysstat setpriv"
4440

@@ -711,7 +707,7 @@ if [ "$apache" = 'no' ]; then
711707
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
712708
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
713709
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
714-
software=$(echo "$software" | sed -e "s/libapache2-mod-php$fpm_v//")
710+
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
715711
fi
716712
if [ "$vsftpd" = 'no' ]; then
717713
software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -748,60 +744,66 @@ if [ "$dovecot" = 'no' ]; then
748744
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
749745
fi
750746
if [ "$mysql" = 'no' ]; then
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//")
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//')
755751
if [ "$multiphp" = 'yes' ]; then
756752
for v in "${multiphp_v[@]}"; do
757753
software=$(echo "$software" | sed -e "s/php$v-mysql//")
758754
software=$(echo "$software" | sed -e "s/php$v-bz2//")
759755
done
760756
fi
761-
software=$(echo "$software" | sed -e "s/phpmyadmin//")
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//')
762761
fi
763762
if [ "$postgresql" = 'no' ]; then
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//")
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//')
767766
if [ "$multiphp" = 'yes' ]; then
768767
for v in "${multiphp_v[@]}"; do
769768
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
770769
done
771770
fi
772-
software=$(echo "$software" | sed -e "s/phppgadmin//")
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//')
773775
fi
774776
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
775-
software=$(echo "$software" | sed -e "s/fail2ban//")
777+
software=$(echo "$software" | sed -e 's/fail2ban//')
776778
fi
777779
if [ "$phpfpm" = 'yes' ]; then
778-
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
779-
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
780-
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
781-
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
782-
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
783-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
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//')
784786
fi
785787
if [ "$multiphp" = 'yes' ]; then
786-
software=$(echo "$software" | sed -e "s/ php$fpm_v //")
787-
software=$(echo "$software" | sed -e "s/php$fpm_v-auth-sasl//")
788-
software=$(echo "$software" | sed -e "s/php$fpm_v-cgi//")
789-
software=$(echo "$software" | sed -e "s/php$fpm_v-common//")
790-
software=$(echo "$software" | sed -e "s/php$fpm_v-curl//")
791-
software=$(echo "$software" | sed -e "s/php$fpm_v-mail-mime//")
792-
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
793-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-sieve//")
794-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-smtp//")
795-
software=$(echo "$software" | sed -e "s/php$fpm_v-net-socket//")
796-
software=$(echo "$software" | sed -e "s/php$fpm_v-pear//")
797-
software=$(echo "$software" | sed -e "s/php$fpm_v-php-gettext//")
798-
software=$(echo "$software" | sed -e "s/php$fpm_v-phpseclib//")
799-
software=$(echo "$software" | sed -e "s/php$fpm_v-pgsql//")
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//')
800802
fi
801803
if [ -d "$withdebs" ]; then
802-
software=$(echo "$software" | sed -e "s/hestia-nginx//")
803-
software=$(echo "$software" | sed -e "s/hestia-php//")
804-
software=$(echo "$software" | sed -e "s/hestia//")
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//')
805807
fi
806808

807809
#----------------------------------------------------------#

0 commit comments

Comments
 (0)