Merge branch 'hotfix/v3.5.3'

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v3.5.3 - Feb 25, 2016
+- Fixed #650
+- Fixed #681
+
 v3.5.2 - Feb 25, 2016
 - Fixed PHP package dependency (Trusty)
 

ee/cli/plugins/stack.py

@@ -1105,8 +1105,8 @@ def post_pref(self, apt_packages, packages):
                                  "profiler_enable] = off\n")
 
                 # Disable xdebug
-                if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/mods-available/xdebug.ini"):
-                    EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
+                if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/5.6/mods-available/xdebug.ini"):
+                    EEFileUtils.searchreplace(self, "/etc/php/5.6/mods-available/"
                                           "xdebug.ini",
                                           "zend_extension",
                                           ";zend_extension")
@@ -1244,8 +1244,8 @@ def post_pref(self, apt_packages, packages):
                                  "profiler_enable] = off\n")
 
                 # Disable xdebug
-                if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/mods-available/xdebug.ini"):
-                    EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
+                if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/7.0/mods-available/xdebug.ini"):
+                    EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
                                           "xdebug.ini",
                                           "zend_extension",
                                           ";zend_extension")

ee/cli/plugins/stack_upgrade.py

@@ -253,7 +253,7 @@ def default(self):
                     if set(EEVariables.ee_postfix).issubset(set(apt_packages)):
                         EEService.restart_service(self, 'postfix')
                     if set(EEVariables.ee_mysql).issubset(set(apt_packages)):
-                        EEService.restart_service(self, 'hhvm')
+                        EEService.restart_service(self, 'mysql')
                     if set(EEVariables.ee_mail).issubset(set(apt_packages)):
                         EEService.restart_service(self, 'dovecot')
                     if set(EEVariables.ee_redis).issubset(set(apt_packages)):

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.5.2"
+    ee_version = "3.5.3"
 
 
     # 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.2"
+readonly ee_version_new="3.5.3"
 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.2',
+      version='3.5.3',
       description=long_description,
       long_description=long_description,
       classifiers=[],