From 07d5c60ece1348d40ba922c32fad599f7f401837 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 18 Feb 2016 19:09:15 +0530 Subject: [PATCH] Fix static value true --- ee/cli/plugins/site.py | 6 +++--- ee/cli/plugins/site_functions.py | 2 +- ee/cli/plugins/stack.py | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index e234687f..f0d487f8 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -510,9 +510,9 @@ class EESiteCreateController(CementBaseController): data['php7'] = False php7 = 0 - if (self.app.pargs.php7) and (not self.app.pargs.w3tc) and\ - (not self.app.pargs.wpfc) and (not self.app.pargs.wpsc) and (not self.app.pargs.wpredis) \ - and (not self.app.pargs.hhvm): + if (not self.app.pargs.w3tc) and\ + (not self.app.pargs.wpfc) and (not self.app.pargs.wpsc) and (not self.app.pargs.wpredis) \ + and (not self.app.pargs.hhvm): data['basic'] = True diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index b6b0e016..9f9621ac 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -1072,7 +1072,7 @@ def detSitePar(opts): cachelist = list() for key, val in opts.items(): if val and key in ['html', 'php', 'mysql', 'wp', - 'wpsubdir', 'wpsubdomain']: + 'wpsubdir', 'wpsubdomain','php7']: typelist.append(key) elif val and key in ['wpfc', 'wpsc', 'w3tc', 'wpredis']: cachelist.append(key) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 8566a6f7..68595967 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2183,6 +2183,8 @@ class EEStackController(CementBaseController): Log.debug(self, "Setting apt_packages variable for PHP 7.0") if not EEAptGet.is_installed(self, 'php7.0-fpm') : apt_packages = apt_packages + EEVariables.ee_php7_0 + if not EEAptGet.is_installed(self, 'php5.6-fpm'): + apt_packages = apt_packages + EEVariables.ee_php5_6 else: Log.debug(self, "PHP 7.0 already installed") Log.info(self, "PHP 7.0 already installed")