Browse Source

Fix static value true

master
Prabuddha Chakraborty 9 years ago
parent
commit
07d5c60ece
  1. 6
      ee/cli/plugins/site.py
  2. 2
      ee/cli/plugins/site_functions.py
  3. 2
      ee/cli/plugins/stack.py

6
ee/cli/plugins/site.py

@ -510,9 +510,9 @@ class EESiteCreateController(CementBaseController):
data['php7'] = False data['php7'] = False
php7 = 0 php7 = 0
if (self.app.pargs.php7) and (not self.app.pargs.w3tc) and\ if (not self.app.pargs.w3tc) and\
(not self.app.pargs.wpfc) and (not self.app.pargs.wpsc) and (not self.app.pargs.wpredis) \ (not self.app.pargs.wpfc) and (not self.app.pargs.wpsc) and (not self.app.pargs.wpredis) \
and (not self.app.pargs.hhvm): and (not self.app.pargs.hhvm):
data['basic'] = True data['basic'] = True

2
ee/cli/plugins/site_functions.py

@ -1072,7 +1072,7 @@ def detSitePar(opts):
cachelist = list() cachelist = list()
for key, val in opts.items(): for key, val in opts.items():
if val and key in ['html', 'php', 'mysql', 'wp', if val and key in ['html', 'php', 'mysql', 'wp',
'wpsubdir', 'wpsubdomain']: 'wpsubdir', 'wpsubdomain','php7']:
typelist.append(key) typelist.append(key)
elif val and key in ['wpfc', 'wpsc', 'w3tc', 'wpredis']: elif val and key in ['wpfc', 'wpsc', 'w3tc', 'wpredis']:
cachelist.append(key) cachelist.append(key)

2
ee/cli/plugins/stack.py

@ -2183,6 +2183,8 @@ class EEStackController(CementBaseController):
Log.debug(self, "Setting apt_packages variable for PHP 7.0") Log.debug(self, "Setting apt_packages variable for PHP 7.0")
if not EEAptGet.is_installed(self, 'php7.0-fpm') : if not EEAptGet.is_installed(self, 'php7.0-fpm') :
apt_packages = apt_packages + EEVariables.ee_php7_0 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: else:
Log.debug(self, "PHP 7.0 already installed") Log.debug(self, "PHP 7.0 already installed")
Log.info(self, "PHP 7.0 already installed") Log.info(self, "PHP 7.0 already installed")

Loading…
Cancel
Save