From 872b917a3e256e2597e0996bbdef8e91c94a630c Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 10 Feb 2016 14:48:12 +0530 Subject: [PATCH] redis-php7.conf while php7 installation --- ee/cli/plugins/site_functions.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 1266d10b..82b45554 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -762,18 +762,6 @@ def site_package_check(self, stype): out=ee_nginx) ee_nginx.close() - if EEVariables.ee_platform_codename == 'trusty': - if os.path.isfile("/etc/nginx/nginx.conf") and (not - os.path.isfile("/etc/nginx/common/redis-php7.conf")): - data = dict() - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/redis-php7.conf') - ee_nginx = open('/etc/nginx/common/redis-php7.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'redis-php7.mustache', - out=ee_nginx) - ee_nginx.close() - if os.path.isfile("/etc/nginx/nginx.conf") and (not os.path.isfile("/etc/nginx/common/redis-hhvm.conf")): @@ -894,6 +882,17 @@ def site_package_check(self, stype): out=ee_nginx) ee_nginx.close() + if os.path.isfile("/etc/nginx/nginx.conf") and (not + os.path.isfile("/etc/nginx/common/redis-php7.conf")): + data = dict() + Log.debug(self, 'Writting the nginx configuration to ' + 'file /etc/nginx/common/redis-php7.conf') + ee_nginx = open('/etc/nginx/common/redis-php7.conf', + encoding='utf-8', mode='w') + self.app.render((data), 'redis-php7.mustache', + out=ee_nginx) + ee_nginx.close() + if os.path.isfile("/etc/nginx/conf.d/upstream.conf"): if not EEFileUtils.grep(self, "/etc/nginx/conf.d/upstream.conf", "php7"):