@@ -33,8 +33,8 @@ if [ "$release" = '16.04' ]; then
3333elif [ " $release " = ' 16.10' ]; then
3434 software=" nginx apache2 apache2-utils apache2.2-common
3535 apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
36- libapache2-mod-fcgid libapache2-mod-php php php -common php -cgi
37- php -mysql php -curl php -fpm php -pgsql awstats webalizer vsftpd
36+ libapache2-mod-fcgid libapache2-mod-php7.0 php7.0 php7.0 -common php7.0 -cgi
37+ php7.0 -mysql php7.0 -curl php7.0 -fpm php7.0 -pgsql awstats webalizer vsftpd
3838 proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
3939 spamassassin dovecot-imapd dovecot-pop3d roundcube-core
4040 roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -475,7 +475,7 @@ rm -f /etc/apache2/conf.d/* > /dev/null 2>&1
475475# Backing up PHP configuration
476476service php7.0-fpm stop > /dev/null 2>&1
477477service php5-fpm stop > /dev/null 2>&1
478- cp -r /etc/php7/* $vst_backups /php/ > /dev/null 2>&1
478+ cp -r /etc/php7.0 /* $vst_backups /php/ > /dev/null 2>&1
479479cp -r /etc/php5/* $vst_backups /php/ > /dev/null 2>&1
480480cp -r /etc/php/* $vst_backups /php/ > /dev/null 2>&1
481481
@@ -549,12 +549,12 @@ if [ "$apache" = 'no' ]; then
549549 software=$( echo " $software " | sed -e " s/libapache2-mod-ruid2//" )
550550 software=$( echo " $software " | sed -e " s/libapache2-mod-rpaf//" )
551551 software=$( echo " $software " | sed -e " s/libapache2-mod-fcgid//" )
552- software=$( echo " $software " | sed -e " s/libapache2-mod-php7//" )
552+ software=$( echo " $software " | sed -e " s/libapache2-mod-php7.0 //" )
553553 software=$( echo " $software " | sed -e " s/libapache2-mod-php5//" )
554554 software=$( echo " $software " | sed -e " s/libapache2-mod-php//" )
555555fi
556556if [ " $phpfpm " = ' no' ]; then
557- software=$( echo " $software " | sed -e " s/php7-fpm//" )
557+ software=$( echo " $software " | sed -e " s/php7.0 -fpm//" )
558558 software=$( echo " $software " | sed -e " s/php5-fpm//" )
559559 software=$( echo " $software " | sed -e " s/php-fpm//" )
560560fi
@@ -590,7 +590,7 @@ if [ "$mysql" = 'no' ]; then
590590 software=$( echo " $software " | sed -e ' s/mysql-server//' )
591591 software=$( echo " $software " | sed -e ' s/mysql-client//' )
592592 software=$( echo " $software " | sed -e ' s/mysql-common//' )
593- software=$( echo " $software " | sed -e ' s/php7-mysql//' )
593+ software=$( echo " $software " | sed -e ' s/php7.0 -mysql//' )
594594 software=$( echo " $software " | sed -e ' s/php5-mysql//' )
595595 software=$( echo " $software " | sed -e ' s/php-mysql//' )
596596 software=$( echo " $software " | sed -e ' s/phpMyAdmin//' )
599599if [ " $postgresql " = ' no' ]; then
600600 software=$( echo " $software " | sed -e ' s/postgresql-contrib//' )
601601 software=$( echo " $software " | sed -e ' s/postgresql//' )
602- software=$( echo " $software " | sed -e ' s/php7-pgsql//' )
602+ software=$( echo " $software " | sed -e ' s/php7.0 -pgsql//' )
603603 software=$( echo " $software " | sed -e ' s/php5-pgsql//' )
604604 software=$( echo " $software " | sed -e ' s/php-pgsql//' )
605605 software=$( echo " $software " | sed -e ' s/phppgadmin//' )
@@ -1130,7 +1130,6 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
11301130 fi
11311131
11321132 mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
1133- php7enmod mcrypt 2> /dev/null
11341133 php5enmod mcrypt 2> /dev/null
11351134 phpenmod mcrypt 2> /dev/null
11361135 service apache2 restart
0 commit comments