From 73fb3b9495b28c58e1f46f6d1a5daa3e69a7b2a9 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 30 Aug 2019 20:59:42 +0200
Subject: [PATCH] Ready for release

---
 CHANGELOG.md                 | 2 +-
 wo/cli/plugins/stack_pref.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eb70f7..9c6a518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Subdomains are automatically secured with an existant Wildcard LetsEncrypt SSL certificate.
 (If a wildcard certificate exist, WordOps will use this certificate for subdomains instead of issuing new certificates)
 - MySQL & Redis stack to `wo stack remove/purge`
-- Dump MySQL databases before purging MySQL Stack
 
 #### Changed
 
@@ -28,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - possible issue with domain variable in `--letsencrypt=wildcard`
 - python3-mysqldb not available on Debian 8 (Jessie)
 - Fix mysql variable skip-name-resolved
+- Fix typo in redis tuning directives
 
 ### v3.9.8.5 - 2019-08-30
 
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index bf1e816..5400b47 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -907,7 +907,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
                                           "wait_timeout		"
                                           "= 600",
                                           "wait_timeout		"
-                                          "= 120")
+                                          "= 120\n"
+                                          "skip-name-resolve = 1\n")
                 # disabling mariadb binlog
                 WOFileUtils.searchreplace(self,
                                           "/etc/mysql/my.cnf",
@@ -957,8 +958,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
                                           "table_open_cache	= 16000")
                 WOFileUtils.searchreplace(self, "/etc/mysql/my.cnf",
                                           "max_allowed_packet	= 16M",
-                                          "max_allowed_packet	= 64M\n"
-                                          "skip-name-resolve=1\n")
+                                          "max_allowed_packet	= 64M\n")
 
                 WOService.stop_service(self, 'mysql')
                 WOFileUtils.mvfile(self, '/var/lib/mysql/ib_logfile0',
@@ -1114,7 +1114,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
         Log.debug(self, "Enabling redis systemd service")
         WOShellExec.cmd_exec(self, "systemctl enable redis-server")
         if (os.path.isfile("/etc/redis/redis.conf") and
-                not WOFileUtils.grep(self, "/etc/mysql/my.cnf", "WordOps")):
+                not WOFileUtils.grep(self, "/etc/redis/redis.conf",
+                                     "WordOps")):
             Log.info(self, "Tuning Redis configuration")
             with open("/etc/redis/redis.conf",
                       "a") as redis_file: