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] 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: