Merge branch 'master' into stable

Author: gau1991

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v 3.1.9 - May 23, 2015
+- Fixed "ssl_prefer_server_ciphers" directive is duplicate after ee stack upgrade on Debian #552
+
 v 3.1.8 - May 22, 2015
 - Fixed PHP Failed to Restart after Upgrade #550
 - Improved ee stack services command

ee/cli/plugins/stack_upgrade.py

@@ -7,6 +7,7 @@
 from ee.core.services import EEService
 from ee.core.fileutils import EEFileUtils
 from ee.core.shellexec import EEShellExec
+from ee.core.git import EEGit
 import configparser
 import os
 
@@ -200,6 +201,21 @@ def default(self):
                         ee_nginx.write('fastcgi_param \tSCRIPT_FILENAME '
                                        '\t$request_filename;\n')
 
+                # Fix "ssl_prefer_server_ciphers" directive is duplicate
+                # that is arrived in latest Debian update
+                if EEVariables.ee_platform_distro == 'ubuntu':
+                    data = dict(version=EEVariables.ee_version, Ubuntu=True)
+                else:
+                    data = dict(version=EEVariables.ee_version, Debian=True)
+                Log.debug(self, 'Writting the nginx configuration to '
+                                'file /etc/nginx/conf.d/ee-nginx.conf ')
+                ee_nginx = open('/etc/nginx/conf.d/ee-nginx.conf',
+                                encoding='utf-8', mode='w')
+                self.app.render((data), 'nginx-core.mustache', out=ee_nginx)
+                ee_nginx.close()
+
+                EEGit.add(self, ["/etc/nginx"], msg="Updated Nginx")
+
                 EEService.restart_service(self, 'nginx')
 
             if set(EEVariables.ee_php).issubset(set(apt_packages)):

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.1.8"
+    ee_version = "3.1.9"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.1"

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.1.8"
+readonly ee_version_new="3.1.9"
 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

@@ -54,7 +54,7 @@
     os.system("git config --global user.email {0}".format(ee_email))
 
 setup(name='ee',
-      version='3.1.8',
+      version='3.1.9',
       description=long_description,
       long_description=long_description,
       classifiers=[],