Merge branch 'hotfix/v3.3.2' into develop

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

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:

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,

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()

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}')

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=[],