From 06be38cb5face76f4090afcf2e75a7231282b99f Mon Sep 17 00:00:00 2001
From: Josh Lyford <joshlyford@gmail.com>
Date: Tue, 17 Feb 2015 14:11:07 -0500
Subject: [PATCH 1/2] Add dbhost to wp-config create function

---
 ee/cli/plugins/site_functions.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index 680c5263..096dce30 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -184,18 +184,18 @@ def setupwordpress(self, data):
         Log.debug(self, "Generating wp-config for WordPress Single site")
         Log.debug(self, "bash -c \"php /usr/bin/wp --allow-root "
                   + "core config "
-                  + "--dbname={0} --dbprefix={1} --dbuser={2} "
+                  + "--dbname={0} --dbprefix={1} --dbuser={2} --dbhost={3} "
                   .format(data['ee_db_name'], ee_wp_prefix,
-                          data['ee_db_user'])
+                          data['ee_db_user'], data['ee_db_host'])
                   + "--dbpass= "
                   "--extra-php<<PHP \n {1}\nPHP\""
                   .format(data['ee_db_pass'],
                           "\n\ndefine(\'WP_DEBUG\', false);"))
         EEShellExec.cmd_exec(self, "bash -c \"php /usr/bin/wp --allow-root "
                              + "core config "
-                             + "--dbname={0} --dbprefix={1} --dbuser={2} "
+                             + "--dbname={0} --dbprefix={1} --dbuser={2} --dbhost={3} "
                              .format(data['ee_db_name'], ee_wp_prefix,
-                                     data['ee_db_user'])
+                                     data['ee_db_user'],  data['ee_db_host'])
                              + "--dbpass={0} "
                                "--extra-php<<PHP \n {1}\nPHP\""
                                .format(data['ee_db_pass'],
@@ -206,8 +206,8 @@ def setupwordpress(self, data):
         Log.debug(self, "Generating wp-config for WordPress multisite")
         Log.debug(self, "bash -c \"php /usr/bin/wp --allow-root "
                   + "core config "
-                  + "--dbname={0} --dbprefix={1} "
-                  .format(data['ee_db_name'], ee_wp_prefix)
+                  + "--dbname={0} --dbprefix={1} --dbhost={2} "
+                  .format(data['ee_db_name'], ee_wp_prefix, data['ee_db_host'])
                   + "--dbuser={0} --dbpass= "
                   "--extra-php<<PHP \n {2} {3} {4}\nPHP\""
                   .format(data['ee_db_user'], data['ee_db_pass'],
@@ -218,8 +218,8 @@ def setupwordpress(self, data):
                           "\n\ndefine(\'WP_DEBUG\', false);"))
         EEShellExec.cmd_exec(self, "bash -c \"php /usr/bin/wp --allow-root "
                              + "core config "
-                             + "--dbname={0} --dbprefix={1} "
-                             .format(data['ee_db_name'], ee_wp_prefix)
+                             + "--dbname={0} --dbprefix={1} --dbhost={3} "
+                             .format(data['ee_db_name'], ee_wp_prefix, data['ee_db_host'])
                              + "--dbuser={0} --dbpass={1} "
                                "--extra-php<<PHP \n {2} {3} {4}\nPHP\""
                              .format(data['ee_db_user'], data['ee_db_pass'],

From bd6ec5ec9761f40f90d342aff71d600ed6a09e17 Mon Sep 17 00:00:00 2001
From: Josh Lyford <joshlyford@gmail.com>
Date: Wed, 18 Feb 2015 05:08:42 -0500
Subject: [PATCH 2/2] Fix: tuple index out of range on multisite install

---
 ee/cli/plugins/site_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index 096dce30..2812e61e 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -218,7 +218,7 @@ def setupwordpress(self, data):
                           "\n\ndefine(\'WP_DEBUG\', false);"))
         EEShellExec.cmd_exec(self, "bash -c \"php /usr/bin/wp --allow-root "
                              + "core config "
-                             + "--dbname={0} --dbprefix={1} --dbhost={3} "
+                             + "--dbname={0} --dbprefix={1} --dbhost={2} "
                              .format(data['ee_db_name'], ee_wp_prefix, data['ee_db_host'])
                              + "--dbuser={0} --dbpass={1} "
                                "--extra-php<<PHP \n {2} {3} {4}\nPHP\""