Skip to content

Commit b4c4e29

Browse files
committed
Fix ee stack service for nginx mainline
1 parent 5fff4d7 commit b4c4e29

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ee/cli/plugins/stack_services.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def start(self):
3333
self.app.pargs.postfix = True
3434

3535
if self.app.pargs.nginx:
36-
if EEAptGet.is_installed(self, 'nginx-custom'):
36+
if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'):
3737
services = services + ['nginx']
3838
else:
3939
Log.info(self, "Nginx is not installed")
@@ -104,7 +104,7 @@ def stop(self):
104104
self.app.pargs.postfix = True
105105

106106
if self.app.pargs.nginx:
107-
if EEAptGet.is_installed(self, 'nginx-custom'):
107+
if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'):
108108
services = services + ['nginx']
109109
else:
110110
Log.info(self, "Nginx is not installed")
@@ -175,7 +175,7 @@ def restart(self):
175175
self.app.pargs.postfix = True
176176

177177
if self.app.pargs.nginx:
178-
if EEAptGet.is_installed(self, 'nginx-custom'):
178+
if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'):
179179
services = services + ['nginx']
180180
else:
181181
Log.info(self, "Nginx is not installed")
@@ -247,7 +247,7 @@ def status(self):
247247
self.app.pargs.hhvm = True
248248

249249
if self.app.pargs.nginx:
250-
if EEAptGet.is_installed(self, 'nginx-custom'):
250+
if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'):
251251
services = services + ['nginx']
252252
else:
253253
Log.info(self, "Nginx is not installed")
@@ -318,7 +318,7 @@ def reload(self):
318318
self.app.pargs.postfix = True
319319

320320
if self.app.pargs.nginx:
321-
if EEAptGet.is_installed(self, 'nginx-custom'):
321+
if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'):
322322
services = services + ['nginx']
323323
else:
324324
Log.info(self, "Nginx is not installed")

0 commit comments

Comments
 (0)