Skip to content

Commit 8bd6f4c

Browse files
committed
Fix stack_upgrade
1 parent 692d0e1 commit 8bd6f4c

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

ee/cli/plugins/stack_upgrade.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def upgrade_php56(self):
6767
Log.error(self, "Unable to find PHP 5.5")
6868

6969
Log.info(self, "During PHP update process non nginx-cached"
70-
" parts of your site may remain down")
70+
" parts of your site may remain down.")
7171

7272
# Check prompt
7373
if (not self.app.pargs.no_prompt):
@@ -86,7 +86,10 @@ def upgrade_php56(self):
8686
Log.info(self, "Updating apt-cache, please wait...")
8787
EEAptGet.update(self)
8888
Log.info(self, "Installing packages, please wait ...")
89-
EEAptGet.install(self, EEVariables.ee_php)
89+
if EEVariables.ee_platform_codename == 'trusty':
90+
EEAptGet.install(self, EEVariables.ee_php5_6 + EEVariables.ee_php_extra)
91+
else:
92+
EEAptGet.install(self, EEVariables.ee_php)
9093

9194
if EEVariables.ee_platform_distro == "debian":
9295
EEShellExec.cmd_exec(self, "pecl install xdebug")
@@ -239,6 +242,10 @@ def default(self):
239242
EEService.restart_service(self, 'nginx')
240243
if set(EEVariables.ee_php).issubset(set(apt_packages)):
241244
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')
242249
if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
243250
EEService.restart_service(self, 'hhvm')
244251
if set(EEVariables.ee_postfix).issubset(set(apt_packages)):

0 commit comments

Comments
 (0)