Removed unwanted checks as now we are using same package on Debian and Ubuntu

ee/cli/plugins/site_functions.py

@@ -560,12 +560,7 @@ def site_package_check(self, stype):
                  'wpsubdomain']:
         Log.debug(self, "Setting apt_packages variable for Nginx")
 
-        if EEVariables.ee_platform_distro == 'debian':
+        if not EEAptGet.is_installed(self, 'nginx-custom'):
-            check_nginx = 'nginx-extras'
-        else:
-            check_nginx = 'nginx-custom'
-
-        if not EEAptGet.is_installed(self, check_nginx):
             apt_packages = apt_packages + EEVariables.ee_nginx
         else:
             # Fix for Nginx white screen death

ee/cli/plugins/stack.py

@@ -1442,12 +1442,7 @@ class EEStackController(CementBaseController):
             if self.app.pargs.nginx:
                 Log.debug(self, "Setting apt_packages variable for Nginx")
 
-                if EEVariables.ee_platform_distro == 'debian':
+                if not EEAptGet.is_installed(self, 'nginx-custom'):
-                    check_nginx = 'nginx-extras'
-                else:
-                    check_nginx = 'nginx-custom'
-
-                if not EEAptGet.is_installed(self, check_nginx):
                     apt_packages = apt_packages + EEVariables.ee_nginx
                 else:
                     Log.debug(self, "Nginx already installed")

ee/cli/plugins/stack_services.py

@@ -34,12 +34,7 @@ class EEStackStatusController(CementBaseController):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
+            if EEAptGet.is_installed(self, 'nginx-custom'):
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -105,12 +100,7 @@ class EEStackStatusController(CementBaseController):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
+            if EEAptGet.is_installed(self, 'nginx-custom'):
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -176,12 +166,7 @@ class EEStackStatusController(CementBaseController):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
+            if EEAptGet.is_installed(self, 'nginx-custom'):
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -247,12 +232,7 @@ class EEStackStatusController(CementBaseController):
             self.app.pargs.hhvm = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
+            if EEAptGet.is_installed(self, 'nginx-custom'):
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")
@@ -317,12 +297,7 @@ class EEStackStatusController(CementBaseController):
             self.app.pargs.postfix = True
 
         if self.app.pargs.nginx:
-            if EEVariables.ee_platform_distro == 'debian':
+            if EEAptGet.is_installed(self, 'nginx-custom'):
-                check_nginx = 'nginx-extras'
-            else:
-                check_nginx = 'nginx-custom'
-
-            if EEAptGet.is_installed(self, check_nginx):
                 services = services + ['nginx']
             else:
                 Log.info(self, "Nginx is not installed")

ee/cli/plugins/stack_upgrade.py

@@ -140,12 +140,7 @@ class EEStackUpgradeController(CementBaseController):
                     Log.info(self, "Mail server is not installed")
 
             if self.app.pargs.nginx:
-                if EEVariables.ee_platform_distro == 'debian':
+                if EEAptGet.is_installed(self, 'nginx-custom'):
-                    check_nginx = 'nginx-extras'
-                else:
-                    check_nginx = 'nginx-custom'
-
-                if EEAptGet.is_installed(self, check_nginx):
                     apt_packages = apt_packages + EEVariables.ee_nginx
                 else:
                     Log.info(self, "Nginx is not already installed")