Browse Source

fixed zone WORDPRESS conflicts

feature/refactor-php
harshadyeola 9 years ago
parent
commit
240d66eefd
  1. 8
      ee/cli/plugins/stack.py
  2. 2
      ee/cli/templates/ee-plus.mustache

8
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

2
ee/cli/templates/ee-plus.mustache

@ -82,5 +82,3 @@ gzip_types
text/x-component
text/xml
text/javascript;
include /etc/nginx/sites-enabled/*;

Loading…
Cancel
Save