diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 2dac1443..add00d0f 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -715,13 +715,13 @@ def site_package_check(self, stype): if EEVariables.ee_platform_codename == 'trusty': 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 + apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra else: Log.warn(self, "PHP 7.0 not available for your system.") 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 + EEVariables.ee_php_extra + apt_packages = apt_packages + EEVariables.ee_php if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']: Log.debug(self, "Setting apt_packages variable for MySQL") @@ -846,7 +846,7 @@ def site_package_check(self, stype): 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 + apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra if os.path.isdir("/etc/nginx/common") and (not os.path.isfile("/etc/nginx/common/php7.conf")): diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index d0c90a90..7b7a81f8 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2182,7 +2182,7 @@ class EEStackController(CementBaseController): if EEVariables.ee_platform_codename == 'trusty': 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 + apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra if not EEAptGet.is_installed(self, 'php5.6-fpm'): apt_packages = apt_packages + EEVariables.ee_php5_6 + EEVariables.ee_php_extra else: @@ -2604,12 +2604,16 @@ class EEStackController(CementBaseController): Log.debug(self, "Purge apt_packages variable PHP") if EEVariables.ee_platform_codename == 'trusty': apt_packages = apt_packages + EEVariables.ee_php5_6 + if not EEAptGet.is_installed(self, 'php7.0-fpm'): + apt_packages = apt_packages + EEVariables.ee_php_extra else: apt_packages = apt_packages + EEVariables.ee_php if self.app.pargs.php7: if EEVariables.ee_platform_codename == 'trusty': Log.debug(self, "Removing apt_packages variable of PHP 7.0") apt_packages = apt_packages + EEVariables.ee_php7_0 + if not EEAptGet.is_installed(self, 'php5.6-fpm'): + apt_packages = apt_packages + EEVariables.ee_php_extra else: Log.info(self,"PHP 7.0 not supported.") if self.app.pargs.hhvm: