diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 377e3bb1..b918e496 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -844,7 +844,7 @@ def site_package_check(self, stype): if EEVariables.ee_platform_codename != 'trusty': Log.error(self,"PHP 7.0 is not supported in your Platform") - Log.debug(self, "Setting apt_packages variable for HHVM") + 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 diff --git a/ee/cli/templates/upstream.mustache b/ee/cli/templates/upstream.mustache index 0cd2ae3b..473fd1bc 100644 --- a/ee/cli/templates/upstream.mustache +++ b/ee/cli/templates/upstream.mustache @@ -9,7 +9,6 @@ server 127.0.0.1:{{debug}}; } {{#php7conf}} upstream php7 { -# server unix:/run/php5-fpm.sock; server 127.0.0.1:{{php7}}; } upstream debug7 { @@ -17,6 +16,7 @@ upstream debug7 { server 127.0.0.1:{{debug7}}; } {{/php7conf}} + {{#hhvmconf}} upstream hhvm { # HHVM Pool