From b4c4e2904b98f517535d9580ef04ad96ea75cd3b Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 5 Jan 2016 12:08:09 +0530 Subject: [PATCH] Fix ee stack service for nginx mainline --- ee/cli/plugins/stack_services.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/cli/plugins/stack_services.py b/ee/cli/plugins/stack_services.py index 75b53646..45a947bf 100644 --- a/ee/cli/plugins/stack_services.py +++ b/ee/cli/plugins/stack_services.py @@ -33,7 +33,7 @@ class EEStackStatusController(CementBaseController): self.app.pargs.postfix = True if self.app.pargs.nginx: - if EEAptGet.is_installed(self, 'nginx-custom'): + if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -104,7 +104,7 @@ class EEStackStatusController(CementBaseController): self.app.pargs.postfix = True if self.app.pargs.nginx: - if EEAptGet.is_installed(self, 'nginx-custom'): + if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -175,7 +175,7 @@ class EEStackStatusController(CementBaseController): self.app.pargs.postfix = True if self.app.pargs.nginx: - if EEAptGet.is_installed(self, 'nginx-custom'): + if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -247,7 +247,7 @@ class EEStackStatusController(CementBaseController): self.app.pargs.hhvm = True if self.app.pargs.nginx: - if EEAptGet.is_installed(self, 'nginx-custom'): + if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -318,7 +318,7 @@ class EEStackStatusController(CementBaseController): self.app.pargs.postfix = True if self.app.pargs.nginx: - if EEAptGet.is_installed(self, 'nginx-custom'): + if EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self,'nginx-mainline'): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed")