@@ -30,14 +30,11 @@ if [ "$release" = '16.04' ]; then
3030 flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota
3131 e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils
3232 bsdmainutils cron vesta vesta-nginx vesta-php expect"
33-
3433elif [ " $release " = ' 16.10' ]; then
35- echo " deb http://archive.ubuntu.com/ubuntu/ vivid main restricted universe multiverse" >> /etc/apt/sources.list
36- apt-get update
3734 software=" nginx apache2 apache2-utils apache2.2-common
3835 apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf
39- libapache2-mod-fcgid libapache2-mod-php5 php5 php5 -common php5 -cgi
40- php5 -mysql php5 -curl php5 -fpm php5 -pgsql awstats webalizer vsftpd
36+ libapache2-mod-fcgid libapache2-mod-php php php -common php -cgi
37+ php -mysql php -curl php -fpm php -pgsql awstats webalizer vsftpd
4138 proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
4239 spamassassin dovecot-imapd dovecot-pop3d roundcube-core
4340 roundcube-mysql roundcube-plugins mysql-server mysql-common
@@ -478,6 +475,7 @@ rm -f /etc/apache2/conf.d/* > /dev/null 2>&1
478475# Backing up PHP configuration
479476service php7.0-fpm stop > /dev/null 2>&1
480477service php5-fpm stop > /dev/null 2>&1
478+ cp -r /etc/php7/* $vst_backups /php/ > /dev/null 2>&1
481479cp -r /etc/php5/* $vst_backups /php/ > /dev/null 2>&1
482480cp -r /etc/php/* $vst_backups /php/ > /dev/null 2>&1
483481
@@ -551,10 +549,12 @@ if [ "$apache" = 'no' ]; then
551549 software=$( echo " $software " | sed -e " s/libapache2-mod-ruid2//" )
552550 software=$( echo " $software " | sed -e " s/libapache2-mod-rpaf//" )
553551 software=$( echo " $software " | sed -e " s/libapache2-mod-fcgid//" )
552+ software=$( echo " $software " | sed -e " s/libapache2-mod-php7//" )
554553 software=$( echo " $software " | sed -e " s/libapache2-mod-php5//" )
555554 software=$( echo " $software " | sed -e " s/libapache2-mod-php//" )
556555fi
557556if [ " $phpfpm " = ' no' ]; then
557+ software=$( echo " $software " | sed -e " s/php7-fpm//" )
558558 software=$( echo " $software " | sed -e " s/php5-fpm//" )
559559 software=$( echo " $software " | sed -e " s/php-fpm//" )
560560fi
@@ -590,14 +590,16 @@ 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//' )
593594 software=$( echo " $software " | sed -e ' s/php5-mysql//' )
594- software=$( echo " $software " | sed -e ' s/phpMyAdmin//' )
595595 software=$( echo " $software " | sed -e ' s/php-mysql//' )
596+ software=$( echo " $software " | sed -e ' s/phpMyAdmin//' )
596597 software=$( echo " $software " | sed -e ' s/phpmyadmin//' )
597598fi
598599if [ " $postgresql " = ' no' ]; then
599600 software=$( echo " $software " | sed -e ' s/postgresql-contrib//' )
600601 software=$( echo " $software " | sed -e ' s/postgresql//' )
602+ software=$( echo " $software " | sed -e ' s/php7-pgsql//' )
601603 software=$( echo " $software " | sed -e ' s/php5-pgsql//' )
602604 software=$( echo " $software " | sed -e ' s/php-pgsql//' )
603605 software=$( echo " $software " | sed -e ' s/phppgadmin//' )
@@ -1128,6 +1130,7 @@ if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
11281130 fi
11291131
11301132 mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql
1133+ php7enmod mcrypt 2> /dev/null
11311134 php5enmod mcrypt 2> /dev/null
11321135 phpenmod mcrypt 2> /dev/null
11331136 service apache2 restart
0 commit comments