do not install nginx-custom if nginx-plus installed

Author: harshadyeola

ee/cli/plugins/site_functions.py

@@ -661,9 +661,10 @@ def site_package_check(self, stype):
             if EEAptGet.is_installed(self, 'nginx-plus'):
                 # do something
                 # do post nginx installation configuration
-                print("NGINX-PLUS detected ...")
+                Log.info(self, "NGINX PLUS Detected ...")
+                Log.info(self,
+                         "Installing EasyEngine Configurations for NGINX PLUS")
                 apt = ["nginx-plus"] + EEVariables.ee_nginx
-                packages = []
                 #apt_packages = apt_packages + EEVariables.ee_nginx
                 stack.post_pref(apt, packages)
 

ee/cli/plugins/stack.py

@@ -449,7 +449,7 @@ def post_pref(self, apt_packages, packages):
                                             " /etc/nginx/nginx.conf")
 
                         # EasyEngine config for NGINX plus
-                        data['version'] = EEVariables.ee_version 
+                        data['version'] = EEVariables.ee_version
                         Log.debug(self, 'Writting for nginx plus configuration'
                                   ' to file /etc/nginx/conf.d/ee-plus.conf')
                         ee_nginx = open('/etc/nginx/conf.d/ee-plus.conf',
@@ -1605,7 +1605,15 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
                 Log.debug(self, "Setting apt_packages variable for Nginx")
 
                 if not EEAptGet.is_installed(self, 'nginx-custom'):
-                    apt_packages = apt_packages + EEVariables.ee_nginx
+                    if not EEAptGet.is_installed(self, 'nginx-plus'):
+                        apt_packages = apt_packages + EEVariables.ee_nginx
+                    else:
+                        Log.info(self, "NGINX PLUS Detected ...")
+                        Log.info(self,
+                                 "Installing EasyEngine Configurations for NGINX PLUS")
+                        apt = ["nginx-plus"] + EEVariables.ee_nginx
+                        #apt_packages = apt_packages + EEVariables.ee_nginx
+                        self.post_pref(apt, packages)
                 else:
                     Log.debug(self, "Nginx already installed")
                     Log.info(self, "Nginx already installed")