Browse Source

Now grep is on whole directory /etc/nginx

bugfixes
gau1991 10 years ago
parent
commit
c705763c78
  1. 4
      ee/cli/plugins/stack.py

4
ee/cli/plugins/stack.py

@ -188,8 +188,8 @@ class EEStackController(CementBaseController):
EEService.reload_service(self, 'postfix') EEService.reload_service(self, 'postfix')
if set(EEVariables.ee_nginx).issubset(set(apt_packages)): if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
if ((not EEFileUtils.grep(self, "/etc/nginx", "EasyEngine")) if ((not EEShellExec.cmd_exec(self, "grep EasyEngine "
and os.path.isfile('/etc/nginx/nginx.conf')): "/etc/nginx")) and os.path.isfile('/etc/nginx/nginx.conf')):
nc = NginxConfig() nc = NginxConfig()
Log.debug(self, 'Loading file /etc/nginx/nginx.conf ') Log.debug(self, 'Loading file /etc/nginx/nginx.conf ')
nc.loadf('/etc/nginx/nginx.conf') nc.loadf('/etc/nginx/nginx.conf')

Loading…
Cancel
Save