From 807c552eedb69ec2d71e74d9d929f32e403f1b61 Mon Sep 17 00:00:00 2001 From: prabuddha Date: Wed, 24 Feb 2016 02:28:41 +0530 Subject: [PATCH] Fix zlib issue --- ee/core/variables.py | 4 ++-- install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index cdc0093c..45c1e8d4 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -121,10 +121,10 @@ class EEVariables(): elif ee_platform_codename == 'trusty': ee_php_repo = "ppa:ondrej/php" ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap", - "php5.6-mcrypt", "php5.6-readline", + "php5.6-mcrypt", "php5.6-readline", "php5.6-zlib", "php5.6-zip", "php5.6-mysql", "php5.6-cli"] ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap", - "php7.0-mcrypt", "php7.0-readline", + "php7.0-mcrypt", "php7.0-readline", "php7.0-zlib", "php7.0-zip", "php7.0-mysql", "php7.0-cli"] ee_php_extra = ["php5.6-common", "php7.0-common", "php-memcached", "php-imagick", "memcached", "graphviz", "php-pear", "php-xdebug"] diff --git a/install b/install index 982850fc..8fbac2d2 100644 --- a/install +++ b/install @@ -304,7 +304,7 @@ function ee_upgrade_php(){ add-apt-repository -y 'ppa:ondrej/php' ee_lib_echo "Updating required packages, please wait..." apt-get update &>> /dev/null - apt-get -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 || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + apt-get -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 php5.6-zlib php7.0-common php-memcached php-imagick memcached graphviz php-pear php-xdebug || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 if [ -e /etc/php5/fpm/pool.d/www.conf -a -e /etc/php5/fpm/pool.d/debug.conf -a -e /etc/php5/fpm/php.ini -a -e /etc/php5/fpm/php-fpm.conf ]; then cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null