From 57d57e829d245a3f19a906766b7039023a1dc98a Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Thu, 13 Jun 2019 17:28:23 +0200
Subject: [PATCH 1/6] WP_CACHE_KEY first fix

---
 wo/cli/plugins/site_functions.py | 52 ++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 39cb072..83887f7 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -317,12 +317,10 @@ def setupwordpress(self, data):
                                             ) +
                                     "--dbpass=\'{0}\' "
                                     "--extra-php<<PHP \n"
-                                    "{1} {redissalt}\nPHP\""
+                                    "{1}\nPHP\""
                                     .format(data['wo_db_pass'],
-                                            "\n\ndefine(\'WP_DEBUG\', false);",
-                                            redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
-                                                      .format(wo_domain_name) if data['wpredis']
-                                                      else ''),
+                                            "\n\ndefine(\'WP_DEBUG\',"
+                                            " false);"),
                                     log=False
                                     ):
                 pass
@@ -354,15 +352,13 @@ def setupwordpress(self, data):
                                     .format(data['wo_db_name'], wo_wp_prefix,
                                             data['wo_db_host']) +
                                     "--dbuser=\'{0}\' --dbpass=\'{1}\' "
-                                    "--extra-php<<PHP \n {2} {3} {redissalt}\nPHP\""
+                                    "--extra-php<<PHP \n {2} {3}\nPHP\""
                                     .format(data['wo_db_user'],
                                             data['wo_db_pass'],
                                             "\ndefine(\'WPMU_ACCEL_REDIRECT\',"
                                             " true);",
-                                            "\n\ndefine(\'WP_DEBUG\', false);",
-                                            redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
-                                            .format(wo_domain_name) if data['wpredis']
-                                            else ''),
+                                            "\n\ndefine(\'WP_DEBUG\',"
+                                            " false);"),
                                     log=False
                                     ):
                 pass
@@ -544,6 +540,42 @@ def setupwordpress(self, data):
     """Install Redis Cache"""
     if data['wpredis']:
         installwp_plugin(self, 'redis-cache', data)
+        if installwp_plugin(self, 'redis-cache', data):
+            if WOFileUtils.isexist(self, "{0}/wp-config.php"
+                                   .format(wo_site_webroot)):
+                config_path = '{0}/wp-config.php'.format(
+                    wo_site_webroot)
+            elif WOFileUtils.isexist(self, "{0}/htdocs/wp-config.php"
+                                     .format(wo_site_webroot)):
+                config_path = '{0}/htdocs/wp-config.php'.format(
+                    wo_site_webroot)
+            else:
+                Log.debug(
+                    self, "Updating wp-config.php failed. "
+                    "File could not be located.")
+                Log.error(
+                    self, "wp-config.php could not be located !!")
+                raise SiteError
+
+            if WOShellExec.cmd_exec(self, "grep -q "
+                                    "\"WP_CACHE_KEY_SALT\" {0}"
+                                    .format(config_path)):
+                pass
+            else:
+                try:
+                    wpconfig = open("{0}".format(config_path),
+                                    encoding='utf-8', mode='a')
+                    wpconfig.write("\n\ndefine( \'WP_CACHE_KEY_SALT\',"
+                                   " \'{0}:\' );".format(wo_domain))
+                    wpconfig.close()
+                except IOError as e:
+                    Log.debug(self, str(e))
+                    Log.debug(self, "Updating wp-config.php failed.")
+                    Log.warn(self, "Updating wp-config.php failed. "
+                             "Could not append:"
+                             "\ndefine( \'WP_CACHE_KEY_SALT\', "
+                             "\'{0}:\' );".format(wo_domain) +
+                             "\nPlease add manually")
 
     wp_creds = dict(wp_user=wo_wp_user, wp_pass=wo_wp_pass,
                     wp_email=wo_wp_email)

From ff1eabfc0ea0b2501c8b7a2bb80f10917938e2bd Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Thu, 13 Jun 2019 17:47:58 +0200
Subject: [PATCH 2/6] update travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2ee76d3..28ce07f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,4 +54,4 @@ script:
   - sudo wp --allow-root --info
   - sudo wo info || sudo tail -n50 /var/log/wo/wordops.log
   - sudo tree -L 2 /etc/nginx
-  - sudo tree -L 3 /var/www/22222/htdocs/
+  - sudo cat /var/www/wpredis.net/wp-config.php

From f57856f41d2b018d7eeea5dde5dad7295e6573cb Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sat, 15 Jun 2019 13:02:13 +0200
Subject: [PATCH 3/6] Another fix for WP_CACHE_KEY_SALT

---
 wo/cli/plugins/site_functions.py | 66 +++++++++-----------------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 83887f7..d17f3cf 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -317,10 +317,9 @@ def setupwordpress(self, data):
                                             ) +
                                     "--dbpass=\'{0}\' "
                                     "--extra-php<<PHP \n"
-                                    "{1}\nPHP\""
+                                    "\n{1}\nPHP\""
                                     .format(data['wo_db_pass'],
-                                            "\n\ndefine(\'WP_DEBUG\',"
-                                            " false);"),
+                                            "\ndefine(\'WP_DEBUG\', false);"),
                                     log=False
                                     ):
                 pass
@@ -328,6 +327,7 @@ def setupwordpress(self, data):
                 raise SiteError("generate wp-config failed for wp single site")
         except CommandExecutionError as e:
             raise SiteError("generate wp-config failed for wp single site")
+
     else:
         Log.debug(self, "Generating wp-config for WordPress multisite")
         Log.debug(self, "bash -c \"php {0} --allow-root "
@@ -352,13 +352,13 @@ def setupwordpress(self, data):
                                     .format(data['wo_db_name'], wo_wp_prefix,
                                             data['wo_db_host']) +
                                     "--dbuser=\'{0}\' --dbpass=\'{1}\' "
-                                    "--extra-php<<PHP \n {2} {3}\nPHP\""
+                                    "--extra-php<<PHP \n "
+                                    "\n{2} {3}\nPHP\""
                                     .format(data['wo_db_user'],
                                             data['wo_db_pass'],
                                             "\ndefine(\'WPMU_ACCEL_REDIRECT\',"
                                             " true);",
-                                            "\n\ndefine(\'WP_DEBUG\',"
-                                            " false);"),
+                                            "\ndefine(\'WP_DEBUG\', false);"),
                                     log=False
                                     ):
                 pass
@@ -367,6 +367,11 @@ def setupwordpress(self, data):
         except CommandExecutionError as e:
             raise SiteError("generate wp-config failed for wp multi site")
 
+    WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
+                         .format(WOVariables.wo_wpcli_path) +
+                         "config set WP_CACHE_KEY_SALT "
+                         "\'{0}:\'".format(wo_domain_name))
+
     # WOFileUtils.mvfile(self, os.getcwd()+'/wp-config.php',
     #                   os.path.abspath(os.path.join(os.getcwd(), os.pardir)))
 
@@ -540,42 +545,6 @@ def setupwordpress(self, data):
     """Install Redis Cache"""
     if data['wpredis']:
         installwp_plugin(self, 'redis-cache', data)
-        if installwp_plugin(self, 'redis-cache', data):
-            if WOFileUtils.isexist(self, "{0}/wp-config.php"
-                                   .format(wo_site_webroot)):
-                config_path = '{0}/wp-config.php'.format(
-                    wo_site_webroot)
-            elif WOFileUtils.isexist(self, "{0}/htdocs/wp-config.php"
-                                     .format(wo_site_webroot)):
-                config_path = '{0}/htdocs/wp-config.php'.format(
-                    wo_site_webroot)
-            else:
-                Log.debug(
-                    self, "Updating wp-config.php failed. "
-                    "File could not be located.")
-                Log.error(
-                    self, "wp-config.php could not be located !!")
-                raise SiteError
-
-            if WOShellExec.cmd_exec(self, "grep -q "
-                                    "\"WP_CACHE_KEY_SALT\" {0}"
-                                    .format(config_path)):
-                pass
-            else:
-                try:
-                    wpconfig = open("{0}".format(config_path),
-                                    encoding='utf-8', mode='a')
-                    wpconfig.write("\n\ndefine( \'WP_CACHE_KEY_SALT\',"
-                                   " \'{0}:\' );".format(wo_domain))
-                    wpconfig.close()
-                except IOError as e:
-                    Log.debug(self, str(e))
-                    Log.debug(self, "Updating wp-config.php failed.")
-                    Log.warn(self, "Updating wp-config.php failed. "
-                             "Could not append:"
-                             "\ndefine( \'WP_CACHE_KEY_SALT\', "
-                             "\'{0}:\' );".format(wo_domain) +
-                             "\nPlease add manually")
 
     wp_creds = dict(wp_user=wo_wp_user, wp_pass=wo_wp_pass,
                     wp_email=wo_wp_email)
@@ -1311,7 +1280,7 @@ def setupLetsEncrypt(self, wo_domain_name):
                                        "'/etc/letsencrypt/config' "
                                        "--issue "
                                        "-d {0} -d www.{0} -w /var/www/html "
-                                       "-k ec-384 --force"
+                                       "-k ec-384 -f"
                                        .format(wo_domain_name))
     else:
         Log.info(self, "Issuing SSL cert with acme.sh")
@@ -1320,7 +1289,7 @@ def setupLetsEncrypt(self, wo_domain_name):
                                    "'/etc/letsencrypt/config' "
                                    "--issue "
                                    "-d {0} -d www.{0} -w /var/www/html "
-                                   "-k ec-384"
+                                   "-k ec-384 -f"
                                    .format(wo_domain_name))
 
     if ssl:
@@ -1340,7 +1309,8 @@ def setupLetsEncrypt(self, wo_domain_name):
                                             "{0}/{1}/fullchain.pem "
                                             "--ca-file {0}/{1}/ca.pem "
                                             "--reloadcmd "
-                                            "\"service nginx restart\" "
+                                            "\"nginx -t && "
+                                            "service nginx restart\" "
                                             .format(WOVariables.wo_ssl_live,
                                                     wo_domain_name))
             Log.info(
@@ -1395,7 +1365,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
                                        "'/etc/letsencrypt/config' "
                                        "--issue "
                                        "-d {0} -w /var/www/html "
-                                       "-k ec-384 --force"
+                                       "-k ec-384 -f"
                                        .format(wo_domain_name))
     else:
         Log.info(self, "Issuing SSL cert with acme.sh")
@@ -1404,7 +1374,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
                                    "'/etc/letsencrypt/config' "
                                    "--issue "
                                    "-d {0} -w /var/www/html "
-                                   "-k ec-384"
+                                   "-k ec-384 -f"
                                    .format(wo_domain_name))
     if ssl:
 
@@ -1423,7 +1393,7 @@ def setupLetsEncryptSubdomain(self, wo_domain_name):
                                             "{0}/{1}/fullchain.pem "
                                             "--ca-file {0}/{1}/ca.pem "
                                             "--reloadcmd "
-                                            "\"service nginx restart\" "
+                                            "\"nginx -t && service nginx restart\" "
                                             .format(WOVariables.wo_ssl_live,
                                                     wo_domain_name))
 

From a3b861f515a11a656a35f592fea06b8b8d5a1b0f Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sat, 15 Jun 2019 13:14:08 +0200
Subject: [PATCH 4/6] Change method for WP_CACHE_KEY_SALT

---
 wo/cli/plugins/site_functions.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index d17f3cf..93c1ad5 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -328,6 +328,11 @@ def setupwordpress(self, data):
         except CommandExecutionError as e:
             raise SiteError("generate wp-config failed for wp single site")
 
+        WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
+                             .format(WOVariables.wo_wpcli_path) +
+                             "config set WP_CACHE_KEY_SALT "
+                             "\'{0}:\'".format(wo_domain_name))
+
     else:
         Log.debug(self, "Generating wp-config for WordPress multisite")
         Log.debug(self, "bash -c \"php {0} --allow-root "
@@ -367,10 +372,10 @@ def setupwordpress(self, data):
         except CommandExecutionError as e:
             raise SiteError("generate wp-config failed for wp multi site")
 
-    WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
-                         .format(WOVariables.wo_wpcli_path) +
-                         "config set WP_CACHE_KEY_SALT "
-                         "\'{0}:\'".format(wo_domain_name))
+        WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
+                             .format(WOVariables.wo_wpcli_path) +
+                             "config set WP_CACHE_KEY_SALT "
+                             "\'{0}:\'".format(wo_domain_name))
 
     # WOFileUtils.mvfile(self, os.getcwd()+'/wp-config.php',
     #                   os.path.abspath(os.path.join(os.getcwd(), os.pardir)))

From 3eaeff89a1d584984354a0943be52658f9b32d82 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sun, 16 Jun 2019 19:10:59 +0200
Subject: [PATCH 5/6] Last fix for WP_CACHE_KEY_SALT

---
 wo/cli/plugins/site_functions.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 93c1ad5..9d35048 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -296,7 +296,7 @@ def setupwordpress(self, data):
         Log.debug(self, "Generating wp-config for WordPress Single site")
         Log.debug(self, "bash -c \"php {0} --allow-root "
                   .format(WOVariables.wo_wpcli_path) +
-                  "core config " +
+                  "config create " +
                   "--dbname=\'{0}\' --dbprefix=\'{1}\' --dbuser=\'{2}\' "
                   "--dbhost=\'{3}\' "
                   .format(data['wo_db_name'], wo_wp_prefix,
@@ -308,7 +308,7 @@ def setupwordpress(self, data):
         try:
             if WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root"
                                     .format(WOVariables.wo_wpcli_path) +
-                                    " core config " +
+                                    " config create " +
                                     "--dbname=\'{0}\' --dbprefix=\'{1}\' "
                                     "--dbuser=\'{2}\' --dbhost=\'{3}\' "
                                     .format(data['wo_db_name'], wo_wp_prefix,
@@ -331,13 +331,13 @@ def setupwordpress(self, data):
         WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
                              .format(WOVariables.wo_wpcli_path) +
                              "config set WP_CACHE_KEY_SALT "
-                             "\'{0}:\'".format(wo_domain_name))
+                             "\'{0}:\'\"".format(wo_domain_name))
 
     else:
         Log.debug(self, "Generating wp-config for WordPress multisite")
         Log.debug(self, "bash -c \"php {0} --allow-root "
                   .format(WOVariables.wo_wpcli_path) +
-                  "core config " +
+                  "config create " +
                   "--dbname=\'{0}\' --dbprefix=\'{1}\' --dbhost=\'{2}\' "
                   .format(data['wo_db_name'], wo_wp_prefix, data['wo_db_host']) +
                   "--dbuser=\'{0}\' --dbpass=\'{1}\' "
@@ -351,7 +351,7 @@ def setupwordpress(self, data):
         try:
             if WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root"
                                     .format(WOVariables.wo_wpcli_path) +
-                                    " core config " +
+                                    " config create " +
                                     "--dbname=\'{0}\' --dbprefix=\'{1}\' "
                                     "--dbhost=\'{2}\' "
                                     .format(data['wo_db_name'], wo_wp_prefix,
@@ -375,7 +375,7 @@ def setupwordpress(self, data):
         WOShellExec.cmd_exec(self, "bash -c \"php {0} --allow-root "
                              .format(WOVariables.wo_wpcli_path) +
                              "config set WP_CACHE_KEY_SALT "
-                             "\'{0}:\'".format(wo_domain_name))
+                             "\'{0}:\'\"".format(wo_domain_name))
 
     # WOFileUtils.mvfile(self, os.getcwd()+'/wp-config.php',
     #                   os.path.abspath(os.path.join(os.getcwd(), os.pardir)))

From 7eacd6c44d848053f8b7552ada3ad52f6809900a Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Sun, 16 Jun 2019 19:37:27 +0200
Subject: [PATCH 6/6] update changelog

---
 CHANGELOG.md            | 4 ++++
 wo/cli/plugins/debug.py | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbc0762..e6d7734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.6 - [Unreleased]
 
+#### Fixed
+
+- WP_CACHE_KEY_SALT set twice
+
 ### v3.9.5.1 - 2019-05-10
 
 #### Fixed
diff --git a/wo/cli/plugins/debug.py b/wo/cli/plugins/debug.py
index 51178ae..1c29c68 100644
--- a/wo/cli/plugins/debug.py
+++ b/wo/cli/plugins/debug.py
@@ -100,7 +100,8 @@ class WODebugController(CementBaseController):
 
             for ip_addr in debug_address:
                 if not ("debug_connection "+ip_addr in open('/etc/nginx/'
-                                                            'nginx.conf', encoding='utf-8').read()):
+                                                            'nginx.conf',
+                                                            encoding='utf-8').read()):
                     Log.info(self, "Setting up Nginx debug connection"
                              " for "+ip_addr)
                     WOShellExec.cmd_exec(self, "sed -i \"/events {{/a\\ \\ \\ "