From 240d66eefdb13583d3723e32938ab84ce3fb7421 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Wed, 9 Sep 2015 18:10:21 +0530 Subject: [PATCH] fixed zone WORDPRESS conflicts --- ee/cli/plugins/stack.py | 8 ++++++++ ee/cli/templates/ee-plus.mustache | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index b71dd459..811081e8 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -449,6 +449,14 @@ class EEStackController(CementBaseController): " -e '/^#user/a user" "\ www-data\;'" " /etc/nginx/nginx.conf") + if not EEShellExec.cmd_exec(self, "cat /etc/nginx/" + "nginx.conf | grep -q " + "'/etc/nginx/sites-enabled'"): + EEShellExec.cmd_exec(self, "sed -i '/\/etc\/" + "nginx\/conf\.d\/\*" + "\.conf/a \ include" + "\ \/etc\/nginx\/sites-enabled" + "\/*;' /etc/nginx/nginx.conf") # EasyEngine config for NGINX plus data['version'] = EEVariables.ee_version diff --git a/ee/cli/templates/ee-plus.mustache b/ee/cli/templates/ee-plus.mustache index 61a0e0a5..fc90602b 100644 --- a/ee/cli/templates/ee-plus.mustache +++ b/ee/cli/templates/ee-plus.mustache @@ -82,5 +82,3 @@ gzip_types text/x-component text/xml text/javascript; - -include /etc/nginx/sites-enabled/*;