Skip to content

Commit 13d9dea

Browse files
committed
memcache package added
1 parent 2727f4f commit 13d9dea

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

ee/core/variables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class EEVariables():
128128
"php7.0-mcrypt", "php7.0-readline", "php7.0-common", "php7.0-recode",
129129
"php7.0-mysql", "php7.0-cli", "php7.0-curl", "php7.0-mbstring",
130130
"php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml"]
131-
ee_php_extra = ["php-memcached", "php-imagick", "memcached",
131+
ee_php_extra = ["php-memcached", "php-imagick", "php-memcache", "memcached",
132132
"graphviz", "php-pear", "php-xdebug", "php-msgpack"]
133133
elif ee_platform_distro == 'debian':
134134
if ee_platform_codename == 'wheezy':

install

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ function ee_upgrade_php(){
304304
add-apt-repository -y 'ppa:ondrej/php'
305305
ee_lib_echo "Upgrading required packages, please wait..."
306306
apt-get update &>> /dev/null
307-
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-curl php5.6-mbstring php5.6-bcmath php5.6-recode php5.6-mysql php5.6-opcache php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
307+
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-curl php5.6-mbstring php5.6-bcmath php5.6-recode php5.6-mysql php5.6-opcache php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
308308
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
309309
cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null
310310
cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null
@@ -327,11 +327,13 @@ function ee_upgrade_php(){
327327

328328
#Fix for PHP 5.6 + 7.0 missed packages
329329
elif [ -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then
330-
apt-get -y install php5.6-zip php5.6-xml php5.6-curl php5.6-mbstring php5.6-recode php5.6-bcmath php5.6-mysql php5.6-opcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
330+
apt-get -y install php5.6-zip php5.6-xml php5.6-curl php5.6-mbstring php5.6-recode php5.6-bcmath php5.6-mysql php5.6-opcache php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
331331
dpkg-query -W -f='${Status} ${Version}\n' php7.0-fpm 2>/dev/null | grep installed
332332
if [ "$?" -eq "0" ]; then
333-
apt-get -y install php7.0-zip php7.0-xml php7.0-curl php7.0-mbstring php7.0-recode php7.0-bcmath php7.0-mysql php7.0-opcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
333+
apt-get -y install php7.0-zip php7.0-xml php7.0-curl php7.0-mbstring php7.0-recode php7.0-bcmath php7.0-mysql php7.0-opcache php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
334+
service php7.0-fpm restart &>> /dev/null
334335
fi
336+
service php5.6-fpm restart &>> /dev/null
335337
fi
336338
fi
337339

0 commit comments

Comments
 (0)