diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index fcdebc1d..55ad93ad 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -625,8 +625,16 @@ class EESiteCreateController(CementBaseController): if self.app.pargs.pagespeed: operateOnPagespeed(self, data) + if data['php7']: + php_version = "7.0" + else: + if EEVariables.ee_platform_codename == 'trusty': + php_version = "5.6" + else: + php_version = "5.5" + addNewSite(self, ee_domain, stype, cache, ee_site_webroot, - hhvm=hhvm, pagespeed=pagespeed) + hhvm=hhvm, pagespeed=pagespeed, php_version=php_version) # Setup database for MySQL site if 'ee_db_name' in data.keys() and not data['wp']: diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index b918e496..f7841112 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -718,9 +718,9 @@ def site_package_check(self, stype): apt_packages = apt_packages + EEVariables.ee_php7_0 else: Log.warn(self, "PHP 7.0 not available for your system.") - Log.info(self, "Setting apt_packages variable for PHP 5.0") - Log.debug(self, "Setting apt_packages variable for PHP 5.0") if not EEAptGet.is_installed(self, 'php5-fpm'): + Log.info(self, "Setting apt_packages variable for PHP 5.0") + Log.debug(self, "Setting apt_packages variable for PHP 5.0") apt_packages = apt_packages + EEVariables.ee_php5_6 if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']: