Browse Source

Fix minor issue

master
Prabuddha Chakraborty 9 years ago
parent
commit
bddb8cc101
  1. 5
      CHANGELOG.txt
  2. 14
      ee/cli/plugins/stack_upgrade.py
  3. 2
      install

5
CHANGELOG.txt

@ -1,5 +1,8 @@
v3.5.0 - Feb 17, 2016
- Added PHP 7.0 support for UBUNTU(Trusty)
- Added PHP 7.0 support for Ubuntu(Trusty)
- Dual support for PHP 5.6 + PHP 7.0
- Removed old repository for PHP
- Fixed minor issues
v3.4.1 - Jan 20, 2016
- Fixed and update ee stack install --nginx/--nginxmainline

14
ee/cli/plugins/stack_upgrade.py

@ -240,12 +240,14 @@ class EEStackUpgradeController(CementBaseController):
if (set(EEVariables.ee_nginx).issubset(set(apt_packages)) or
set(EEVariables.ee_nginx_dev).issubset(set(apt_packages))):
EEService.restart_service(self, 'nginx')
if set(EEVariables.ee_php).issubset(set(apt_packages)):
EEService.restart_service(self, 'php5-fpm')
if set(EEVariables.ee_php5_6).issubset(set(apt_packages)):
EEService.restart_service(self, 'php5.6-fpm')
if set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
EEService.restart_service(self, 'php7.0-fpm')
if EEVariables.ee_platform_codename != 'trusty':
if set(EEVariables.ee_php).issubset(set(apt_packages)):
EEService.restart_service(self, 'php5-fpm')
else:
if set(EEVariables.ee_php5_6).issubset(set(apt_packages)):
EEService.restart_service(self, 'php5.6-fpm')
if set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
EEService.restart_service(self, 'php7.0-fpm')
if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
EEService.restart_service(self, 'hhvm')
if set(EEVariables.ee_postfix).issubset(set(apt_packages)):

2
install

@ -302,7 +302,7 @@ function ee_upgrade_php(){
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'
ee_lib_echo "Updating required packages, please wait..."
ee_lib_echo "Upgrading 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 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
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

Loading…
Cancel
Save