Skip to content

Commit 5b834dc

Browse files
author
Serghey Rodin
committed
fixes for php-fpm on debian 9
1 parent 9d7d9f3 commit 5b834dc

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

install/vst-install-debian.sh

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ apt-key add deb_signing.key
486486
# Creating backup directory tree
487487
mkdir -p $vst_backups
488488
cd $vst_backups
489-
mkdir nginx apache2 php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd
489+
mkdir nginx apache2 php php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd
490490
mkdir spamassassin mysql postgresql mongodb vesta
491491

492492
# Backing up Nginx configuration
@@ -567,9 +567,11 @@ if [ "$apache" = 'no' ]; then
567567
software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//")
568568
software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//")
569569
software=$(echo "$software" | sed -e "s/libapache2-mod-php5//")
570+
software=$(echo "$software" | sed -e "s/libapache2-mod-php//")
570571
fi
571572
if [ "$phpfpm" = 'no' ]; then
572573
software=$(echo "$software" | sed -e "s/php5-fpm//")
574+
software=$(echo "$software" | sed -e "s/php-fpm//")
573575
fi
574576
if [ "$vsftpd" = 'no' ]; then
575577
software=$(echo "$software" | sed -e "s/vsftpd//")
@@ -605,12 +607,14 @@ if [ "$mysql" = 'no' ]; then
605607
software=$(echo "$software" | sed -e 's/mysql-client//')
606608
software=$(echo "$software" | sed -e 's/mysql-common//')
607609
software=$(echo "$software" | sed -e 's/php5-mysql//')
610+
software=$(echo "$software" | sed -e 's/php-mysql//')
608611
software=$(echo "$software" | sed -e 's/phpMyAdmin//')
609612
fi
610613
if [ "$postgresql" = 'no' ]; then
611614
software=$(echo "$software" | sed -e 's/postgresql-contrib//')
612615
software=$(echo "$software" | sed -e 's/postgresql//')
613616
software=$(echo "$software" | sed -e 's/php5-pgsql//')
617+
software=$(echo "$software" | sed -e 's/php-pgsql//')
614618
software=$(echo "$software" | sed -e 's/phppgadmin//')
615619
fi
616620
if [ "$softaculous" = 'no' ]; then
@@ -740,8 +744,14 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then
740744
echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf
741745
echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf
742746
echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf
743-
if [ "$phpfpm" = 'yes' ]; then
744-
echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf
747+
if [ "$release" -eq 9 ]; then
748+
if [ "$phpfpm" = 'yes' ]; then
749+
echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf
750+
fi
751+
else
752+
if [ "$phpfpm" = 'yes' ]; then
753+
echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf
754+
fi
745755
fi
746756
echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf
747757
fi
@@ -898,10 +908,17 @@ fi
898908
#----------------------------------------------------------#
899909

900910
if [ "$phpfpm" = 'yes' ]; then
901-
wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf
902-
update-rc.d php5-fpm defaults
903-
service php5-fpm start
904-
check_result $? "php-fpm start failed"
911+
if [ "$release" -eq 9 ]; then
912+
wget $vestacp/php-fpm/www.conf -O /etc/php/7.0/fpm/pool.d/www.conf
913+
update-rc.d php7.0-fpm defaults
914+
service php7.0-fpm start
915+
check_result $? "php-fpm start failed"
916+
else
917+
wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf
918+
update-rc.d php5-fpm defaults
919+
service php5-fpm start
920+
check_result $? "php-fpm start failed"
921+
fi
905922
fi
906923

907924

0 commit comments

Comments
 (0)