Merge tag 'v3.5.5' into develop

EasyEngine v3.5.5

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,9 @@
+v3.5.5 - Apr 13, 2016
+- WP-CLI support for wordpress v4.5, PR #701
+- PR #686
+- Fix #702
+- Minor Fixes
+
 v3.5.4 - Mar 15, 2016
 - Fixed Vimbadmin installation issue
 - PR #684

ee/cli/plugins/site.py

@@ -1213,6 +1213,13 @@ def doupdatesite(self, pargs):
                 Log.info(self,"SSL not configured for site http://{0}".format(ee_domain))
                 return 0
 
+        if pargs.all and pargs.letsencrypt == "off":
+            if letsencrypt is check_ssl:
+                if letsencrypt is False:
+                    Log.error(self, "SSl is not configured for given "
+                             "site",False)
+                    return 0
+
         if pargs.letsencrypt:
             if pargs.letsencrypt == 'on':
                 data['letsencrypt'] = True

ee/cli/plugins/site_functions.py

@@ -1417,7 +1417,7 @@ def renewLetsEncrypt(self, ee_domain_name):
 
     Log.info(self, "Renewing SSl cert for https://{0}".format(ee_domain_name))
 
-    ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
+    ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew-by-default certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
                                 .format(ee_domain_name)
                                 + "--email {0} --text --agree-tos".format(ee_wp_email))
     mail_list = ''
@@ -1508,7 +1508,7 @@ def archivedCertificateHandle(self,domain,ee_wp_email):
 
     elif check_prompt == "3":
         Log.info(self,"Please Wait while we renew SSL Certificate for your site.\nIt may take time depending upon network.")
-        ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
+        ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew-by-default certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
                                 .format(domain)
                                 + "--email {0} --text --agree-tos".format(ee_wp_email))
     else:

ee/cli/plugins/stack.py

@@ -2401,24 +2401,24 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
             if 'redis-server' in apt_packages:
                 # set redis.conf parameter
                 # set maxmemory 10% for ram below 512MB and 20% for others
-                # set maxmemory-policy volatile-lru
+                # set maxmemory-policy allkeys-lru
                 if os.path.isfile("/etc/redis/redis.conf"):
                     if EEVariables.ee_ram < 512:
                         Log.debug(self, "Setting maxmemory variable to {0} in redis.conf"
                                             .format(int(EEVariables.ee_ram*1024*1024*0.1)))
                         EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory <bytes>/maxmemory {0}/' /etc/redis/redis.conf"
                                              .format(int(EEVariables.ee_ram*1024*1024*0.1)))
-                        Log.debug(self, "Setting maxmemory-policy variable to volatile-lru in redis.conf")
-                        EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory-policy.*/maxmemory-policy volatile-lru/' "
+                        Log.debug(self, "Setting maxmemory-policy variable to allkeys-lru in redis.conf")
+                        EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory-policy.*/maxmemory-policy allkeys-lru/' "
                                                    "/etc/redis/redis.conf")
                         EEService.restart_service(self, 'redis-server')
                     else:
                         Log.debug(self, "Setting maxmemory variable to {0} in redis.conf"
                                             .format(int(EEVariables.ee_ram*1024*1024*0.2)))
                         EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory <bytes>/maxmemory {0}/' /etc/redis/redis.conf"
                                              .format(int(EEVariables.ee_ram*1024*1024*0.2)))
-                        Log.debug(self, "Setting maxmemory-policy variable to volatile-lru in redis.conf")
-                        EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory-policy.*/maxmemory-policy volatile-lru/' "
+                        Log.debug(self, "Setting maxmemory-policy variable to allkeys-lru in redis.conf")
+                        EEShellExec.cmd_exec(self, "sed -i 's/# maxmemory-policy.*/maxmemory-policy allkeys-lru/' "
                                                    "/etc/redis/redis.conf")
                         EEService.restart_service(self, 'redis-server')
             if disp_msg:

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.5.4"
+    ee_version = "3.5.5"
 
 
     # EasyEngine packages versions

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.5.4"
+readonly ee_version_new="3.5.5"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')

setup.py

@@ -58,7 +58,7 @@
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='ee',
-      version='3.5.4',
+      version='3.5.5',
       description=long_description,
       long_description=long_description,
       classifiers=[],