Merge branch 'hotfix/v3.6.1'

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v3.6.1 - May 20, 2016
+- Fix HHVM Support on Ubuntu Xenial
+
 v3.6.0 - May 16, 2016
 - Add support for Ubuntu 16.04 LTS - Xenial.
 - Updated Nginx to the latest stable version (1.10.1)

ee/cli/plugins/stack.py

@@ -739,7 +739,8 @@ def post_pref(self, apt_packages, packages):
 
                 EEFileUtils.searchreplace(self, "/etc/hhvm/server.ini",
                                                 "9000", "8000")
-                EEFileUtils.searchreplace(self, "/etc/nginx/hhvm.conf",
+                if not EEVariables.ee_platform_codename == 'xenial':
+                    EEFileUtils.searchreplace(self, "/etc/nginx/hhvm.conf",
                                                 "9000", "8000")
 
                 with open("/etc/hhvm/php.ini", "a") as hhvm_file:
@@ -1065,10 +1066,6 @@ def post_pref(self, apt_packages, packages):
                 self.app.render((data), 'php-fpm.mustache', out=ee_php_fpm)
                 ee_php_fpm.close()
 
-
-
-
-
                 # Parse /etc/php/5.6/fpm/pool.d/www.conf
                 config = configparser.ConfigParser()
                 config.read_file(codecs.open('/etc/php/5.6/fpm/pool.d/www.conf',

ee/core/variables.py

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