Skip to content

Commit bddb8cc

Browse files
committed
Fix minor issue
1 parent 8bd6f4c commit bddb8cc

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

CHANGELOG.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
v3.5.0 - Feb 17, 2016
2-
- Added PHP 7.0 support for UBUNTU(Trusty)
2+
- Added PHP 7.0 support for Ubuntu(Trusty)
3+
- Dual support for PHP 5.6 + PHP 7.0
4+
- Removed old repository for PHP
5+
- Fixed minor issues
36

47
v3.4.1 - Jan 20, 2016
58
- Fixed and update ee stack install --nginx/--nginxmainline

ee/cli/plugins/stack_upgrade.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,14 @@ def default(self):
240240
if (set(EEVariables.ee_nginx).issubset(set(apt_packages)) or
241241
set(EEVariables.ee_nginx_dev).issubset(set(apt_packages))):
242242
EEService.restart_service(self, 'nginx')
243-
if set(EEVariables.ee_php).issubset(set(apt_packages)):
244-
EEService.restart_service(self, 'php5-fpm')
245-
if set(EEVariables.ee_php5_6).issubset(set(apt_packages)):
246-
EEService.restart_service(self, 'php5.6-fpm')
247-
if set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
248-
EEService.restart_service(self, 'php7.0-fpm')
243+
if EEVariables.ee_platform_codename != 'trusty':
244+
if set(EEVariables.ee_php).issubset(set(apt_packages)):
245+
EEService.restart_service(self, 'php5-fpm')
246+
else:
247+
if set(EEVariables.ee_php5_6).issubset(set(apt_packages)):
248+
EEService.restart_service(self, 'php5.6-fpm')
249+
if set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
250+
EEService.restart_service(self, 'php7.0-fpm')
249251
if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
250252
EEService.restart_service(self, 'hhvm')
251253
if set(EEVariables.ee_postfix).issubset(set(apt_packages)):

install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function ee_upgrade_php(){
302302
if [ -f /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list ]; then
303303
# add-apt-repository -y --remove 'ppa:ondrej/php5-5.6'
304304
add-apt-repository -y 'ppa:ondrej/php'
305-
ee_lib_echo "Updating required packages, please wait..."
305+
ee_lib_echo "Upgrading required packages, please wait..."
306306
apt-get update &>> /dev/null
307307
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 php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack || 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

0 commit comments

Comments
 (0)