Skip to content

Commit ad050ed

Browse files
ScIT-RaphaelScIT-Raphael
committed
Rework the multi and fpm php part to get a better version handling.
1 parent d40e828 commit ad050ed

File tree

2 files changed

+113
-143
lines changed

2 files changed

+113
-143
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 57 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ os='debian'
2020
release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
2121
codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
2222
hestiacp="$HESTIA/install/$VERSION/$release"
23+
24+
# Define software versions
2325
pma_v='4.8.4'
26+
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3")
27+
fpm_v="7.3"
2428

2529
if [ "$release" -eq 9 ]; then
2630
software="nginx apache2 apache2-utils apache2-suexec-custom
@@ -463,8 +467,8 @@ if [ -z "$email" ]; then
463467
email="admin@$servername"
464468
fi
465469

466-
# Print backup directory
467-
echo "Installation backup directory: $hst_backups"
470+
# Defining backup directory
471+
echo -e "\nInstallation backup directory: $hst_backups"
468472

469473
# Print Log File Path
470474
echo "Installation Log File: $LOG"
@@ -609,25 +613,22 @@ rm -rf $HESTIA > /dev/null 2>&1
609613
#----------------------------------------------------------#
610614

611615
if [ "$multiphp" = 'yes' ]; then
612-
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
613-
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
614-
php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
615-
php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
616-
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
617-
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
618-
php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip
619-
php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
620-
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
621-
php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
622-
php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
623-
php7.3-zip"
624-
software="$software $mph"
616+
for v in "${multiphp_v[@]}"; do
617+
mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
618+
php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip"
619+
# Check is version is 7.1 or below to add mcrypt
620+
if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
621+
mph="$mph php$v-mcrypt"
622+
fi
623+
software="$software $mph"
624+
done
625625
fi
626626

627627
if [ "$phpfpm" = 'yes' ]; then
628-
fpm="php7.3 php7.3-common php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
629-
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml php7.3-zip
630-
php7.3-mbstring php7.3-json php7.3-bz2 php7.3-pspell"
628+
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
629+
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
630+
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
631+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
631632
software="$software $fpm"
632633
fi
633634

@@ -685,22 +686,29 @@ if [ "$mysql" = 'no' ]; then
685686
software=$(echo "$software" | sed -e 's/mariadb-client//')
686687
software=$(echo "$software" | sed -e 's/mariadb-common//')
687688
software=$(echo "$software" | sed -e 's/php-mysql//')
688-
software=$(echo "$software" | sed -e 's/php5.6-mysql//')
689-
software=$(echo "$software" | sed -e 's/php7.0-mysql//')
690-
software=$(echo "$software" | sed -e 's/php7.1-mysql//')
691-
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
692-
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
689+
if [ "$multiphp" = 'yes' ]; then
690+
for v in "${multiphp_v[@]}"; do
691+
software=$(echo "$software" | sed -e "s/php$v-mysql//")
692+
software=$(echo "$software" | sed -e "s/php$v-bz2//")
693+
done
694+
fi
695+
if [ "$phpfpm" = 'yes' ]; then
696+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
697+
fi
693698
software=$(echo "$software" | sed -e 's/phpmyadmin//')
694699
fi
695700
if [ "$postgresql" = 'no' ]; then
696701
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
697702
software=$(echo "$software" | sed -e 's/postgresql//')
698703
software=$(echo "$software" | sed -e 's/php-pgsql//')
699-
software=$(echo "$software" | sed -e 's/php5.6-pgsql//')
700-
software=$(echo "$software" | sed -e 's/php7.0-pgsql//')
701-
software=$(echo "$software" | sed -e 's/php7.1-pgsql//')
702-
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
703-
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
704+
if [ "$multiphp" = 'yes' ]; then
705+
for v in "${multiphp_v[@]}"; do
706+
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
707+
done
708+
fi
709+
if [ "$phpfpm" = 'yes' ]; then
710+
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
711+
fi
704712
software=$(echo "$software" | sed -e 's/phppgadmin//')
705713
fi
706714
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
@@ -971,30 +979,21 @@ if [ "$nginx" = 'yes' ]; then
971979
echo > /etc/nginx/conf.d/hestia.conf
972980
mkdir -p /var/log/nginx/domains
973981
if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
974-
update-rc.d php5.6-fpm defaults > /dev/null 2>&1
975-
update-rc.d php7.0-fpm defaults > /dev/null 2>&1
976-
update-rc.d php7.1-fpm defaults > /dev/null 2>&1
977-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
978-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
979-
cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
980-
rm -f /etc/php/5.6/fpm/pool.d/*
981-
cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
982-
rm -f /etc/php/7.0/fpm/pool.d/*
983-
cp -r /etc/php/7.1/ /root/hst_install_backups/php7.1/
984-
rm -f /etc/php/7.1/fpm/pool.d/*
985-
cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
986-
rm -f /etc/php/7.2/fpm/pool.d/*
987-
cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
988-
rm -f /etc/php/7.3/fpm/pool.d/*
982+
for v in "${multiphp_v[@]}"; do
983+
update-rc.d php$v-fpm defaults > /dev/null 2>&1
984+
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
985+
rm -f /etc/php/$v/fpm/pool.d/*
986+
done
989987
rm -fr $HESTIA/data/templates/web/nginx/*
990988
cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
991-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
992-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.sh $HESTIA/data/templates/web/nginx/default.sh
993-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.tpl $HESTIA/data/templates/web/nginx/default.tpl
994-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.stpl $HESTIA/data/templates/web/nginx/default.stpl
989+
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
990+
fpm_tpl=$(echo "$fpm_v" | sed -e 's/[.]//')
991+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.sh $HESTIA/data/templates/web/nginx/default.sh
992+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.tpl $HESTIA/data/templates/web/nginx/default.tpl
993+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.stpl $HESTIA/data/templates/web/nginx/default.stpl
995994
chmod a+x $HESTIA/data/templates/web/nginx/*.sh
996-
service php7.3-fpm start >> $LOG
997-
check_result $? "php7.3-fpm start failed"
995+
service php$fpm_tpl-fpm start >> $LOG
996+
check_result $? "php$fpm_tpl-fpm start failed"
998997
fi
999998
update-rc.d nginx defaults > /dev/null 2>&1
1000999
service nginx start >> $LOG
@@ -1028,26 +1027,12 @@ if [ "$apache" = 'yes' ]; then
10281027
chmod 751 /var/log/apache2/domains
10291028
if [ "$multiphp" = 'yes' ] ; then
10301029
a2enmod proxy_fcgi setenvif > /dev/null 2>&1
1031-
a2enconf php5.6-fpm > /dev/null 2>&1
1032-
a2enconf php7.0-fpm > /dev/null 2>&1
1033-
a2enconf php7.1-fpm > /dev/null 2>&1
1034-
a2enconf php7.2-fpm > /dev/null 2>&1
1035-
a2enconf php7.3-fpm > /dev/null 2>&1
1036-
update-rc.d php5.6-fpm defaults > /dev/null 2>&1
1037-
update-rc.d php7.0-fpm defaults > /dev/null 2>&1
1038-
update-rc.d php7.1-fpm defaults > /dev/null 2>&1
1039-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
1040-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
1041-
cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
1042-
rm -f /etc/php/5.6/fpm/pool.d/*
1043-
cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
1044-
rm -f /etc/php/7.0/fpm/pool.d/*
1045-
cp -r /etc/php/7.1/ /root/hst_install_backups/php7.1/
1046-
rm -f /etc/php/7.1/fpm/pool.d/*
1047-
cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
1048-
rm -f /etc/php/7.2/fpm/pool.d/*
1049-
cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
1050-
rm -f /etc/php/7.3/fpm/pool.d/*
1030+
for v in "${multiphp_v[@]}"; do
1031+
a2enconf php$v-fpm-fpm > /dev/null 2>&1
1032+
update-rc.d php$v-fpm defaults > /dev/null 2>&1
1033+
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
1034+
rm -f /etc/php/$v/fpm/pool.d/*
1035+
done
10511036
cp -f $hestiacp/multiphp/apache2/* $HESTIA/data/templates/web/apache2/
10521037
chmod a+x $HESTIA/data/templates/web/apache2/*.sh
10531038
if [ "$release" = '8' ]; then
@@ -1069,9 +1054,9 @@ fi
10691054
#----------------------------------------------------------#
10701055

10711056
if [ "$phpfpm" = 'yes' ]; then
1072-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/www.conf
1073-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
1074-
service php7.3-fpm start >> $LOG
1057+
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/www.conf
1058+
update-rc.d php$fpm_v-fpm defaults > /dev/null 2>&1
1059+
service php$fpm_v-fpm start >> $LOG
10751060
check_result $? "php-fpm start failed"
10761061
fi
10771062

‎install/hst-install-ubuntu.sh‎

Lines changed: 56 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ os='ubuntu'
2020
release="$(lsb_release -s -r)"
2121
codename="$(lsb_release -s -c)"
2222
hestiacp="$HESTIA/install/$VERSION/$release"
23+
24+
# Define software versions
2325
pma_v='4.8.4'
26+
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3")
27+
fpm_v="7.3"
2428

2529
# Defining software pack for all distros
2630
software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
@@ -442,7 +446,7 @@ if [ -z "$email" ]; then
442446
fi
443447

444448
# Defining backup directory
445-
echo "Installation backup directory: $hst_backups"
449+
echo -e "\nInstallation backup directory: $hst_backups"
446450

447451
# Print Log File Path
448452
echo "Installation Log File: $LOG"
@@ -585,25 +589,22 @@ rm -rf $HESTIA > /dev/null 2>&1
585589
#----------------------------------------------------------#
586590

587591
if [ "$multiphp" = 'yes' ]; then
588-
mph="php5.6-apcu php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl
589-
php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql
590-
php5.6-soap php5.6-xml php5.6-zip php7.0-mbstring php7.0-bcmath
591-
php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt
592-
php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.1-mbstring
593-
php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl
594-
php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip
595-
php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
596-
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
597-
php7.2-zip php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl
598-
php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
599-
php7.3-zip"
600-
software="$software $mph"
592+
for v in "${multiphp_v[@]}"; do
593+
mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
594+
php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip"
595+
# Check is version is 7.1 or below to add mcrypt
596+
if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
597+
mph="$mph php$v-mcrypt"
598+
fi
599+
software="$software $mph"
600+
done
601601
fi
602602

603603
if [ "$phpfpm" = 'yes' ]; then
604-
fpm="php7.3 php7.3-common php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
605-
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml php7.3-zip
606-
php7.3-mbstring php7.3-json php7.3-bz2 php7.3-pspell"
604+
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
605+
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
606+
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
607+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
607608
software="$software $fpm"
608609
fi
609610

@@ -660,22 +661,29 @@ if [ "$mysql" = 'no' ]; then
660661
software=$(echo "$software" | sed -e 's/mariadb-client//')
661662
software=$(echo "$software" | sed -e 's/mariadb-common//')
662663
software=$(echo "$software" | sed -e 's/php-mysql//')
663-
software=$(echo "$software" | sed -e 's/php5.6-mysql//')
664-
software=$(echo "$software" | sed -e 's/php7.0-mysql//')
665-
software=$(echo "$software" | sed -e 's/php7.1-mysql//')
666-
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
667-
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
664+
if [ "$multiphp" = 'yes' ]; then
665+
for v in "${multiphp_v[@]}"; do
666+
software=$(echo "$software" | sed -e "s/php$v-mysql//")
667+
software=$(echo "$software" | sed -e "s/php$v-bz2//")
668+
done
669+
fi
670+
if [ "$phpfpm" = 'yes' ]; then
671+
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
672+
fi
668673
software=$(echo "$software" | sed -e 's/phpmyadmin//')
669674
fi
670675
if [ "$postgresql" = 'no' ]; then
671676
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
672677
software=$(echo "$software" | sed -e 's/postgresql//')
673678
software=$(echo "$software" | sed -e 's/php-pgsql//')
674-
software=$(echo "$software" | sed -e 's/php5.6-pgsql//')
675-
software=$(echo "$software" | sed -e 's/php7.0-pgsql//')
676-
software=$(echo "$software" | sed -e 's/php7.1-pgsql//')
677-
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
678-
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
679+
if [ "$multiphp" = 'yes' ]; then
680+
for v in "${multiphp_v[@]}"; do
681+
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
682+
done
683+
fi
684+
if [ "$phpfpm" = 'yes' ]; then
685+
software=$(echo "$software" | sed -e "s/php$v-pgsql//")
686+
fi
679687
software=$(echo "$software" | sed -e 's/phppgadmin//')
680688
fi
681689
if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then
@@ -946,30 +954,21 @@ if [ "$nginx" = 'yes' ]; then
946954
echo > /etc/nginx/conf.d/hestia.conf
947955
mkdir -p /var/log/nginx/domains
948956
if [ "$apache" = 'no' ] && [ "$multiphp" = 'yes' ]; then
949-
update-rc.d php5.6-fpm defaults > /dev/null 2>&1
950-
update-rc.d php7.0-fpm defaults > /dev/null 2>&1
951-
update-rc.d php7.1-fpm defaults > /dev/null 2>&1
952-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
953-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
954-
cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
955-
rm -f /etc/php/5.6/fpm/pool.d/*
956-
cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
957-
rm -f /etc/php/7.0/fpm/pool.d/*
958-
cp -r /etc/php/7.1/ /root/hst_install_backups/php7.1/
959-
rm -f /etc/php/7.1/fpm/pool.d/*
960-
cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
961-
rm -f /etc/php/7.2/fpm/pool.d/*
962-
cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
963-
rm -f /etc/php/7.3/fpm/pool.d/*
957+
for v in "${multiphp_v[@]}"; do
958+
update-rc.d php$v-fpm defaults > /dev/null 2>&1
959+
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
960+
rm -f /etc/php/$v/fpm/pool.d/*
961+
done
964962
rm -fr $HESTIA/data/templates/web/nginx/*
965963
cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
966-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
967-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.sh $HESTIA/data/templates/web/nginx/default.sh
968-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.tpl $HESTIA/data/templates/web/nginx/default.tpl
969-
ln -s $HESTIA/data/templates/web/nginx/PHP-73.stpl $HESTIA/data/templates/web/nginx/default.stpl
964+
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/
965+
fpm_tpl=$(echo "$fpm_v" | sed -e 's/[.]//')
966+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.sh $HESTIA/data/templates/web/nginx/default.sh
967+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.tpl $HESTIA/data/templates/web/nginx/default.tpl
968+
ln -s $HESTIA/data/templates/web/nginx/PHP-$fpm_tpl.stpl $HESTIA/data/templates/web/nginx/default.stpl
970969
chmod a+x $HESTIA/data/templates/web/nginx/*.sh
971-
service php7.3-fpm start >> $LOG
972-
check_result $? "php7.3-fpm start failed"
970+
service php$fpm_tpl-fpm start >> $LOG
971+
check_result $? "php$fpm_tpl-fpm start failed"
973972
fi
974973
update-rc.d nginx defaults > /dev/null 2>&1
975974
service nginx start >> $LOG
@@ -1003,26 +1002,12 @@ if [ "$apache" = 'yes' ]; then
10031002
chmod 751 /var/log/apache2/domains
10041003
if [ "$multiphp" = 'yes' ] ; then
10051004
a2enmod proxy_fcgi setenvif > /dev/null 2>&1
1006-
a2enconf php5.6-fpm > /dev/null 2>&1
1007-
a2enconf php7.0-fpm > /dev/null 2>&1
1008-
a2enconf php7.1-fpm > /dev/null 2>&1
1009-
a2enconf php7.2-fpm > /dev/null 2>&1
1010-
a2enconf php7.3-fpm > /dev/null 2>&1
1011-
update-rc.d php5.6-fpm defaults > /dev/null 2>&1
1012-
update-rc.d php7.0-fpm defaults > /dev/null 2>&1
1013-
update-rc.d php7.1-fpm defaults > /dev/null 2>&1
1014-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
1015-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
1016-
cp -r /etc/php/5.6/ /root/hst_install_backups/php5.6/
1017-
rm -f /etc/php/5.6/fpm/pool.d/*
1018-
cp -r /etc/php/7.0/ /root/hst_install_backups/php7.0/
1019-
rm -f /etc/php/7.0/fpm/pool.d/*
1020-
cp -r /etc/php/7.1/ /root/hst_install_backups/php7.1/
1021-
rm -f /etc/php/7.1/fpm/pool.d/*
1022-
cp -r /etc/php/7.2/ /root/hst_install_backups/php7.2/
1023-
rm -f /etc/php/7.2/fpm/pool.d/*
1024-
cp -r /etc/php/7.3/ /root/hst_install_backups/php7.3/
1025-
rm -f /etc/php/7.3/fpm/pool.d/*
1005+
for v in "${multiphp_v[@]}"; do
1006+
a2enconf php$v-fpm-fpm > /dev/null 2>&1
1007+
update-rc.d php$v-fpm defaults > /dev/null 2>&1
1008+
cp -r /etc/php/$v/ /root/hst_install_backups/php$v/
1009+
rm -f /etc/php/$v/fpm/pool.d/*
1010+
done
10261011
cp -f $hestiacp/multiphp/apache2/* $HESTIA/data/templates/web/apache2/
10271012
chmod a+x $HESTIA/data/templates/web/apache2/*.sh
10281013
fi
@@ -1040,9 +1025,9 @@ fi
10401025
#----------------------------------------------------------#
10411026

10421027
if [ "$phpfpm" = 'yes' ]; then
1043-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/www.conf
1044-
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
1045-
service php7.3-fpm start >> $LOG
1028+
cp -f $hestiacp/php-fpm/www.conf /etc/php/$fpm_v/fpm/pool.d/www.conf
1029+
update-rc.d php$fpm_v-fpm defaults > /dev/null 2>&1
1030+
service php$fpm_v-fpm start >> $LOG
10461031
check_result $? "php-fpm start failed"
10471032
fi
10481033

0 commit comments

Comments
 (0)