Skip to content

Commit 9bbe362

Browse files
ScIT-RaphaelScIT-Raphael
committed
Install php7.3 as default.
1 parent 667ce34 commit 9bbe362

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎install/hst-install-debian.sh‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ if [ "$apache" = 'no' ]; then
613613
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
614614
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
615615
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
616-
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.2//")
616+
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.3//")
617617
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
618618
fi
619619
if [ "$vsftpd" = 'no' ]; then
@@ -649,15 +649,15 @@ if [ "$mysql" = 'no' ]; then
649649
software=$(echo "$software" | sed -e 's/mariadb-server//')
650650
software=$(echo "$software" | sed -e 's/mariadb-client//')
651651
software=$(echo "$software" | sed -e 's/mariadb-common//')
652-
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
652+
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
653653
software=$(echo "$software" | sed -e 's/php-mysql//')
654654
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
655655
software=$(echo "$software" | sed -e 's/phpmyadmin//')
656656
fi
657657
if [ "$postgresql" = 'no' ]; then
658658
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
659659
software=$(echo "$software" | sed -e 's/postgresql//')
660-
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
660+
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
661661
software=$(echo "$software" | sed -e 's/php-pgsql//')
662662
software=$(echo "$software" | sed -e 's/phppgadmin//')
663663
fi
@@ -686,9 +686,9 @@ if [ "$multiphp" = 'yes' ]; then
686686
fi
687687

688688
if [ "$phpfpm" = 'yes' ]; then
689-
fpm="php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
690-
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
691-
php7.2-zip"
689+
fpm="php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
690+
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
691+
php7.3-zip"
692692
software="$software $fpm"
693693
fi
694694

@@ -950,13 +950,13 @@ if [ "$nginx" = 'yes' ]; then
950950
rm -f /etc/php/7.3/fpm/pool.d/*
951951
rm -fr $HESTIA/data/templates/web/nginx/*
952952
cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
953-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/
954-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.sh $HESTIA/data/templates/web/nginx/default.sh
955-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.tpl $HESTIA/data/templates/web/nginx/default.tpl
956-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.stpl $HESTIA/data/templates/web/nginx/default.stpl
953+
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
954+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.sh $HESTIA/data/templates/web/nginx/default.sh
955+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.tpl $HESTIA/data/templates/web/nginx/default.tpl
956+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.stpl $HESTIA/data/templates/web/nginx/default.stpl
957957
chmod a+x $HESTIA/data/templates/web/nginx/*.sh
958-
service php7.2-fpm start >> $LOG
959-
check_result $? "php7.2-fpm start failed"
958+
service php7.3-fpm start >> $LOG
959+
check_result $? "php7.3-fpm start failed"
960960
fi
961961
update-rc.d nginx defaults > /dev/null 2>&1
962962
service nginx start >> $LOG
@@ -1031,9 +1031,9 @@ fi
10311031
#----------------------------------------------------------#
10321032

10331033
if [ "$phpfpm" = 'yes' ]; then
1034-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/www.conf
1035-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
1036-
service php7.2-fpm start >> $LOG
1034+
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/www.conf
1035+
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
1036+
service php7.3-fpm start >> $LOG
10371037
check_result $? "php-fpm start failed"
10381038
fi
10391039

‎install/hst-install-ubuntu.sh‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ if [ "$apache" = 'no' ]; then
579579
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
580580
software=$(echo "$software" | sed -e "s/libapache2-mod-rpaf//")
581581
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
582-
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.2//")
582+
software=$(echo "$software" | sed -e "s/libapache2-mod-php7.3//")
583583
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
584584
fi
585585
if [ "$vsftpd" = 'no' ]; then
@@ -614,15 +614,15 @@ if [ "$mysql" = 'no' ]; then
614614
software=$(echo "$software" | sed -e 's/mariadb-server//')
615615
software=$(echo "$software" | sed -e 's/mariadb-client//')
616616
software=$(echo "$software" | sed -e 's/mariadb-common//')
617-
software=$(echo "$software" | sed -e 's/php7.2-mysql//')
617+
software=$(echo "$software" | sed -e 's/php7.3-mysql//')
618618
software=$(echo "$software" | sed -e 's/php-mysql//')
619619
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
620620
software=$(echo "$software" | sed -e 's/phpmyadmin//')
621621
fi
622622
if [ "$postgresql" = 'no' ]; then
623623
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
624624
software=$(echo "$software" | sed -e 's/postgresql//')
625-
software=$(echo "$software" | sed -e 's/php7.2-pgsql//')
625+
software=$(echo "$software" | sed -e 's/php7.3-pgsql//')
626626
software=$(echo "$software" | sed -e 's/php-pgsql//')
627627
software=$(echo "$software" | sed -e 's/phppgadmin//')
628628
fi
@@ -651,9 +651,9 @@ if [ "$multiphp" = 'yes' ]; then
651651
fi
652652

653653
if [ "$phpfpm" = 'yes' ]; then
654-
fpm="php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm
655-
php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml
656-
php7.2-zip"
654+
fpm="php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm
655+
php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml
656+
php7.3-zip"
657657
software="$software $fpm"
658658
fi
659659

@@ -706,7 +706,7 @@ echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate
706706
chmod 755 /etc/cron.daily/ntpdate
707707
ntpdate -s pool.ntp.org
708708

709-
# Adding rssh
709+
# Setup rssh
710710
if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then
711711
echo /usr/bin/rssh >> /etc/shells
712712
fi
@@ -915,13 +915,13 @@ if [ "$nginx" = 'yes' ]; then
915915
rm -f /etc/php/7.3/fpm/pool.d/*
916916
rm -fr $HESTIA/data/templates/web/nginx/*
917917
cp -f $hestiacp/multiphp/nginx/* $HESTIA/data/templates/web/nginx/
918-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/
919-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.sh $HESTIA/data/templates/web/nginx/default.sh
920-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.tpl $HESTIA/data/templates/web/nginx/default.tpl
921-
ln -s $HESTIA/data/templates/web/nginx/PHP-72.stpl $HESTIA/data/templates/web/nginx/default.stpl
918+
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/
919+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.sh $HESTIA/data/templates/web/nginx/default.sh
920+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.tpl $HESTIA/data/templates/web/nginx/default.tpl
921+
ln -s $HESTIA/data/templates/web/nginx/PHP-73.stpl $HESTIA/data/templates/web/nginx/default.stpl
922922
chmod a+x $HESTIA/data/templates/web/nginx/*.sh
923-
service php7.2-fpm start > /dev/null 2>&1
924-
check_result $? "php7.2-fpm start failed"
923+
service php7.3-fpm start >> $LOG
924+
check_result $? "php7.3-fpm start failed"
925925
fi
926926
update-rc.d nginx defaults > /dev/null 2>&1
927927
service nginx start >> $LOG
@@ -992,9 +992,9 @@ fi
992992
#----------------------------------------------------------#
993993

994994
if [ "$phpfpm" = 'yes' ]; then
995-
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.2/fpm/pool.d/www.conf
996-
update-rc.d php7.2-fpm defaults > /dev/null 2>&1
997-
service php7.2-fpm start >> $LOG
995+
cp -f $hestiacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/www.conf
996+
update-rc.d php7.3-fpm defaults > /dev/null 2>&1
997+
service php7.3-fpm start >> $LOG
998998
check_result $? "php-fpm start failed"
999999
fi
10001000

0 commit comments

Comments
 (0)