diff --git a/install b/install index 048556ce..0475260f 100644 --- a/install +++ b/install @@ -207,6 +207,7 @@ function ee_sync_db() done else + ee_php_version=$(php -v | head -n1 | cut -d' ' -f2 |cut -c1-3) ee_lib_echo "Updating EasyEngine Database" echo "ALTER TABLE sites ADD COLUMN db_name varchar;" | sqlite3 /var/lib/ee/ee.db echo "ALTER TABLE sites ADD COLUMN db_user varchar; " | sqlite3 /var/lib/ee/ee.db @@ -214,7 +215,7 @@ function ee_sync_db() echo "ALTER TABLE sites ADD COLUMN db_host varchar;" | sqlite3 /var/lib/ee/ee.db echo "ALTER TABLE sites ADD COLUMN is_hhvm INT DEFAULT '0';" | sqlite3 /var/lib/ee/ee.db echo "ALTER TABLE sites ADD COLUMN is_pagespeed INT DEFAULT '0';" | sqlite3 /var/lib/ee/ee.db - echo "ALTER TABLE sites ADD COLUMN php_version varchar DEFAULT '5.6';" | sqlite3 /var/lib/ee/ee.db + echo "ALTER TABLE sites ADD COLUMN php_version varchar DEFAULT \"$ee_php_version\";" | sqlite3 /var/lib/ee/ee.db fi } @@ -323,6 +324,20 @@ function ee_update_latest() fi fi + if [ "$ee_distro_version" == "trusty" ]; then + + if [ -f /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list ]; then + add-apt-repository -y -remove 'ppa:ondrej/php5-5.6' + add-apt-repository -y 'ppa:ondrej/php' + mv /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list.old &>> /dev/null + apt-get update + apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php7.0-common php-memcached php-imagick memcached graphviz php-pear php-xdebug + service php5-fpm stop &>> /dev/null + service php5.6-fpm restart &>> /dev/null + apt-get -y remove php5-fpm php5-curl php5-gd php5-imap php5-mcrypt php5-common php5-readline php5-mysql php5-cli php5-memcache php5-imagick memcached graphviz php-pear + fi + fi + if [ -f /etc/nginx/nginx.conf ]; then ee_lib_echo "Updating Nginx configuration, please wait..." # From version 3.1.10 we are using Suse builder for repository @@ -604,7 +619,11 @@ else ee_update_latest | tee -ai $ee_install_log ee_git_init | tee -ai $ee_install_log service nginx reload &>> /dev/null - service php5-fpm restart &>> /dev/null + if [ "$ee_distro_version" == "trusty" ]; then + service php5.6-fpm restart &>> /dev/null + else + service php5-fpm restart &>> /dev/null + fi ee_update_wp_cli | tee -ai $ee_install_log else ee_lib_error "Not updating EasyEngine to $ee_version_new, exit status = " 1