From ca8525aefdaa5b15751c3f6ef42166655fa99b81 Mon Sep 17 00:00:00 2001
From: harshadyeola <harshad.yeola@rtcamp.com>
Date: Mon, 27 Jul 2015 01:25:27 +0530
Subject: [PATCH 1/4] bug Fix #593

---
 ee/cli/plugins/site_functions.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index 33f73102..9bd0b907 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -302,9 +302,12 @@ def setupwordpress(self, data):
                                          data['ee_db_user'], data['ee_db_host']
                                          )
                                  + "--dbpass=\'{0}\' "
-                                   "--extra-php<<PHP \n {1}\nPHP\""
+                                   "--extra-php<<PHP \n {1} {redissalt}\nPHP\""
                                    .format(data['ee_db_pass'],
-                                           "\n\ndefine(\'WP_DEBUG\', false);"),
+                                           "\n\ndefine(\'WP_DEBUG\', false);",
+                                           redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
+                                                      .format(ee_domain_name) if data['wpredis'] 
+                                                      else ''),
                                    log=False
                                  )
         except CommandExecutionError as e:
@@ -333,14 +336,17 @@ def setupwordpress(self, data):
                                  .format(data['ee_db_name'], ee_wp_prefix,
                                          data['ee_db_host'])
                                  + "--dbuser=\'{0}\' --dbpass=\'{1}\' "
-                                   "--extra-php<<PHP \n {2} {3} {4}\nPHP\""
+                                   "--extra-php<<PHP \n {2} {3} {4} {redissalt}\nPHP\""
                                  .format(data['ee_db_user'],
                                          data['ee_db_pass'],
                                          "\ndefine(\'WP_ALLOW_MULTISITE\', "
                                          "true);",
                                          "\ndefine(\'WPMU_ACCEL_REDIRECT\',"
                                          " true);",
-                                         "\n\ndefine(\'WP_DEBUG\', false);"),
+                                         "\n\ndefine(\'WP_DEBUG\', false);",
+                                         redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
+                                                      .format(ee_domain_name) if data['wpredis'] 
+                                                      else ''),
                                  log=False
                                  )
         except CommandExecutionError as e:

From bd89024746490d7ff50dcd58c4d68f629ee55ee9 Mon Sep 17 00:00:00 2001
From: harshadyeola <harshad.yeola@rtcamp.com>
Date: Mon, 27 Jul 2015 13:17:17 +0530
Subject: [PATCH 2/4] alternate keyserver while fixing gpg key issues

---
 ee/core/aptget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/core/aptget.py b/ee/core/aptget.py
index 33f5aa11..b8181c6a 100644
--- a/ee/core/aptget.py
+++ b/ee/core/aptget.py
@@ -36,7 +36,7 @@ class EEAptGet():
                     for single_error in error_list:
                         if "NO_PUBKEY" in single_error:
                             key = single_error.rsplit(None, 1)[-1]
-                            EERepo.add_key(self, key)
+                            EERepo.add_key(self, key, keyserver="hkp://pgp.mit.edu")
 
                     proc = subprocess.Popen('apt-get update',
                                             shell=True,

From 1d88ab7c72c35223da8ca2fec3403dded6d0b9a5 Mon Sep 17 00:00:00 2001
From: harshadyeola <harshad.yeola@rtcamp.com>
Date: Mon, 27 Jul 2015 13:59:23 +0530
Subject: [PATCH 3/4] updated versions

---
 ee/core/variables.py | 6 +++---
 install              | 2 +-
 setup.py             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ee/core/variables.py b/ee/core/variables.py
index 9df05b61..5228b7b1 100644
--- a/ee/core/variables.py
+++ b/ee/core/variables.py
@@ -12,13 +12,13 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.3.1"
+    ee_version = "3.3.2"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.19.2"
     ee_adminer = "4.2.1"
-    ee_roundcube = "1.1.1"
-    ee_vimbadmin = "3.0.11"
+    ee_roundcube = "1.1.2"
+    ee_vimbadmin = "3.0.12"
 
     # Get WPCLI path
     ee_wpcli_path = os.popen('which wp | tr "\n" " "').read()
diff --git a/install b/install
index 0fdca708..d1bb6a73 100644
--- a/install
+++ b/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.3.1"
+readonly ee_version_new="3.3.2"
 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}')
diff --git a/setup.py b/setup.py
index 39240800..125f99b6 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ except Exception as e:
     os.system("git config --global user.email {0}".format(ee_email))
 
 setup(name='ee',
-      version='3.3.1',
+      version='3.3.2',
       description=long_description,
       long_description=long_description,
       classifiers=[],

From e4b1b57f08abad1f074a765dd63ef131fefcc68c Mon Sep 17 00:00:00 2001
From: harshadyeola <harshad.yeola@rtcamp.com>
Date: Mon, 27 Jul 2015 14:40:20 +0530
Subject: [PATCH 4/4] updated changelog

---
 CHANGELOG.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ca5876e3..2ed123b8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+v 3.3.2 - Jul 27, 2015
+- Bug Fix #593 
+- Fix package authentication problems
+- Version update roundcube 1.1.2
+- Version update vimbadmin to 3.0.12
+
 v 3.3.1 - Jul 23, 2015
 - Fixed redis query expiration timeout limit
 - Updated redis cache header to more informative