fix git conflict

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,8 @@
+v3.6.2 - Jun 03, 2016
+- Fix Issue #726,#723,#727
+- Update Adminer to v4.2.5
+- Check for already installed nginx package
+
 v3.6.1 - May 20, 2016
 - Fix HHVM Support on Ubuntu Xenial
 

ee/cli/plugins/site.py

@@ -1222,7 +1222,7 @@ def doupdatesite(self, pargs):
                     Log.info(self, "SUCCESS: Certificate was successfully renewed For"
                                " https://{0}".format(ee_domain))
                 else:
-                    Log.info(self,"More than 60 days left for certificate Expiry. Not renewing now.\n")
+                    Log.info(self,"More than 30 days left for certificate Expiry. Not renewing now.\n")
 
                 if (SSL.getExpirationDays(self,ee_domain)>0):
                         Log.info(self, "Your cert will expire within " + str(SSL.getExpirationDays(self,ee_domain)) + " days.")

ee/cli/plugins/site_functions.py

@@ -694,7 +694,13 @@ def site_package_check(self, stype):
                 apt = ["nginx-plus"] + EEVariables.ee_nginx
                 #apt_packages = apt_packages + EEVariables.ee_nginx
                 stack.post_pref(apt, packages)
-
+            elif EEAptGet.is_installed(self, 'nginx'):
+                Log.info(self, "EasyEngine detected a previously installed Nginx package. "
+                                "It may or may not have required modules. "
+                                "\nIf you need help, please create an issue at https://github.com/EasyEngine/easyengine/issues/ \n")
+                apt = ["nginx"] + EEVariables.ee_nginx
+                #apt_packages = apt_packages + EEVariables.ee_nginx
+                stack.post_pref(apt, packages)
             else:
                 apt_packages = apt_packages + EEVariables.ee_nginx
         else:

ee/cli/plugins/stack.py

@@ -262,7 +262,7 @@ def post_pref(self, apt_packages, packages):
                 EEService.reload_service(self, 'postfix')
 
             if set(EEVariables.ee_nginx).issubset(set(apt_packages)):
-                if set(["nginx-plus"]).issubset(set(apt_packages)):
+                if set(["nginx-plus"]).issubset(set(apt_packages)) or set(["nginx"]).issubset(set(apt_packages)):
                     # Fix for white screen death with NGINX PLUS
                     if not EEFileUtils.grep(self, '/etc/nginx/fastcgi_params',
                                             'SCRIPT_FILENAME'):
@@ -458,9 +458,9 @@ def post_pref(self, apt_packages, packages):
 
                     # Nginx-Plus does not have nginx package structure like this
                     # So creating directories
-                    if set(["nginx-plus"]).issubset(set(apt_packages)):
+                    if set(["nginx-plus"]).issubset(set(apt_packages)) or set(["nginx"]).issubset(set(apt_packages)):
                         Log.info(self,
-                                 "Installing EasyEngine Configurations for" "NGINX PLUS")
+                                 "Installing EasyEngine Configurations for" "NGINX")
                         if not os.path.exists('/etc/nginx/sites-available'):
                             Log.debug(self, 'Creating directory'
                                       '/etc/nginx/sites-available')
@@ -569,7 +569,7 @@ def post_pref(self, apt_packages, packages):
                     EEGit.add(self,
                               ["/etc/nginx"], msg="Adding Nginx into Git")
                     EEService.reload_service(self, 'nginx')
-                    if set(["nginx-plus"]).issubset(set(apt_packages)):
+                    if set(["nginx-plus"]).issubset(set(apt_packages)) or set(["nginx"]).issubset(set(apt_packages)):
                         EEShellExec.cmd_exec(self, "sed -i -e 's/^user/#user/'"
                                             " -e '/^#user/a user"
                                             "\ www-data\;'"
@@ -2283,13 +2283,21 @@ 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')):
-                    if not EEAptGet.is_installed(self, 'nginx-plus'):
+                    if not (EEAptGet.is_installed(self, 'nginx-plus') or EEAptGet.is_installed(self, 'nginx')):
                         apt_packages = apt_packages + EEVariables.ee_nginx
                     else:
-                        Log.info(self, "NGINX PLUS Detected ...")
-                        apt = ["nginx-plus"] + EEVariables.ee_nginx
-                        #apt_packages = apt_packages + EEVariables.ee_nginx
-                        self.post_pref(apt, packages)
+                        if EEAptGet.is_installed(self, 'nginx-plus'):
+                            Log.info(self, "NGINX PLUS Detected ...")
+                            apt = ["nginx-plus"] + EEVariables.ee_nginx
+                            #apt_packages = apt_packages + EEVariables.ee_nginx
+                            self.post_pref(apt, packages)
+                        elif EEAptGet.is_installed(self, 'nginx'):
+                            Log.info(self, "EasyEngine detected a previously installed Nginx package. "
+                                "It may or may not have required modules. "
+                                "\nIf you need help, please create an issue at https://github.com/EasyEngine/easyengine/issues/ \n")
+                            apt = ["nginx"] + EEVariables.ee_nginx
+                            #apt_packages = apt_packages + EEVariables.ee_nginx
+                            self.post_pref(apt, packages)
                 else:
                     Log.debug(self, "Nginx Stable already installed")
 #                    if EEAptGet.is_installed(self, 'nginx-mainline'):
@@ -2455,8 +2463,8 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
 
             if self.app.pargs.adminer:
                 Log.debug(self, "Setting packages variable for Adminer ")
-                packages = packages + [["http://downloads.sourceforge.net/"
-                                        "adminer/adminer-{0}.php"
+                packages = packages + [["https://www.adminer.org/static/download/"
+                                        "{0}/adminer-{0}.php"
                                         "".format(EEVariables.ee_adminer),
                                         "{0}22222/"
                                         "htdocs/db/adminer/index.php"

ee/core/aptget.py

@@ -110,7 +110,7 @@ def install(self, packages):
                                         "Dpkg::Options::=\"--force-confdef\""
                                         " -o "
                                         "Dpkg::Options::=\"--force-confold\""
-                                        " -y {0}"
+                                        " -y --allow-unauthenticated {0}"
                                         .format(all_packages), shell=True,
                                         stdin=None, stdout=f, stderr=f,
                                         executable="/bin/bash")

ee/core/variables.py

@@ -14,10 +14,9 @@ class EEVariables():
     # EasyEngine version
     ee_version = "3.7.0"
 
-
     # EasyEngine packages versions
     ee_wp_cli = "0.23.0"
-    ee_adminer = "4.2.1"
+    ee_adminer = "4.2.5"
     ee_roundcube = "1.1.4"
    # ee_vimbadmin = "3.0.12"
     ee_vimbadmin = "master"