From 9d5072c751438cb1663ecbf4c5745c2456d81e1d Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sat, 12 Oct 2019 11:46:11 +0200
Subject: [PATCH] Fix WordPress install error

---
 CHANGELOG.md                     |  1 +
 wo/cli/plugins/site_functions.py | 17 ++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da616ff..b3c6783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - `wo secure --auth`
 - `wo secure --sshport` not working with default ssh config
 - Issues after APT repositories informations changed
+- `www` was added to WordPress site url with subdomains [Issue #178](https://github.com/WordOps/WordOps/issues/178)
 
 ### v3.9.9.2 - 2019-10-04
 
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index a14f911..6edab35 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -301,10 +301,9 @@ def setupwordpress(self, data, vhostonly=False):
                   "--dbhost=\'{3}\' "
                   .format(data['wo_db_name'], wo_wp_prefix,
                           data['wo_db_user'], data['wo_db_host']) +
-                  "--dbpass=\'{0}\' "
-                  "--extra-php<<PHP \n {1}\nPHP\""
-                  .format(data['wo_db_pass'],
-                          "\n\ndefine(\'WP_DEBUG\', false);"))
+                  "--dbpass= "
+                  "--extra-php<<PHP \n {0}\nPHP\""
+                  .format("\n\ndefine(\'WP_DEBUG\', false);"))
         try:
             if WOShellExec.cmd_exec(self, "/bin/bash -c \"{0} --allow-root"
                                     .format(WOVar.wo_wpcli_path) +
@@ -335,9 +334,9 @@ def setupwordpress(self, data, vhostonly=False):
                   "--dbname=\'{0}\' --dbprefix=\'{1}\' --dbhost=\'{2}\' "
                   .format(data['wo_db_name'],
                           wo_wp_prefix, data['wo_db_host']) +
-                  "--dbuser=\'{0}\' --dbpass=\'{1}\' "
-                  "--extra-php<<PHP \n {2} {3} {4} \nPHP\""
-                  .format(data['wo_db_user'], data['wo_db_pass'],
+                  "--dbuser=\'{0}\' --dbpass= "
+                  "--extra-php<<PHP \n {1} {2} {3} \nPHP\""
+                  .format(data['wo_db_user'],
                           "\ndefine(\'WPMU_ACCEL_REDIRECT\',"
                           " true);",
                           "\ndefine(\'CONCATENATE_SCRIPTS\',"
@@ -463,7 +462,7 @@ def setupwordpress(self, data, vhostonly=False):
                   .format(WOVar.wo_wpcli_path) +
                   "--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
                   .format(data['site_name'], wo_wp_user) +
-                  "--admin_password= --admin_email=\'{1}\'"
+                  "--admin_password= --admin_email=\'{0}\'"
                   .format(wo_wp_email))
         try:
             if WOShellExec.cmd_exec(
@@ -489,7 +488,7 @@ def setupwordpress(self, data, vhostonly=False):
                   "core multisite-install "
                   "--url=\'{0}\' --title=\'{0}\' --admin_name=\'{1}\' "
                   .format(data['site_name'], wo_wp_user) +
-                  "--admin_password= --admin_email=\'{1}\' "
+                  "--admin_password= --admin_email=\'{0}\' "
                   "{subdomains}"
                   .format(wo_wp_email,
                           subdomains='--subdomains'