From a40a96c3e3b39d85a40af46f92882f2785cab2a5 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 21 Jan 2020 12:44:07 +0100
Subject: [PATCH] Fix MySQL purge with remote MySQL server

---
 CHANGELOG.md            |  4 ++++
 wo/cli/plugins/stack.py | 17 +++++++----------
 wo/core/mysql.py        |  5 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cccebb..c04ade7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### v3.9.x - [Unreleased]
 
+#### Fixed
+
+- MySQL databases backup when using remote MySQL server
+
 ### v3.11.4 - 2020-01-17
 
 #### Fixed
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index 51db16b..b54605d 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -1123,20 +1123,17 @@ class WOStackController(CementBaseController):
                 if start_purge != "Y" and start_purge != "y":
                     Log.error(self, "Not starting stack purge")
 
-            if (set(["nginx-custom"]).issubset(set(apt_packages))):
+            if "nginx-custom" in apt_packages:
                 WOService.stop_service(self, 'nginx')
 
-            if (set(["fail2ban"]).issubset(set(apt_packages))):
+            if "fail2ban" in apt_packages:
                 WOService.stop_service(self, 'fail2ban')
 
-            if (set(["mariadb-server"]).issubset(set(apt_packages))):
-                if self.app.config.has_section('stack'):
-                    database_host = self.app.config.get(
-                        'stack', 'ip-address')
-                else:
-                    database_host = 'na'
-                if database_host == '127.0.0.1':
-                    WOMysql.backupAll(self)
+            if "mariadb-server" in apt_packages:
+                if self.app.config.has_section('mysql'):
+                    if self.app.config.get(
+                            'mysql', 'grant-host') == 'localhost':
+                        WOMysql.backupAll(self)
                 WOService.stop_service(self, 'mysql')
 
             # Netdata uninstaller
diff --git a/wo/core/mysql.py b/wo/core/mysql.py
index 275a56a..ed3e49c 100644
--- a/wo/core/mysql.py
+++ b/wo/core/mysql.py
@@ -31,9 +31,8 @@ class WOMysql():
         # Makes connection with MySQL server
         try:
             if os.path.exists('/etc/mysql/conf.d/my.cnf'):
-                connection = \
-                    pymysql.connect(read_default_file='/etc/mysql/'
-                                    'conf.d/my.cnf')
+                connection = pymysql.connect(
+                    read_default_file='/etc/mysql/conf.d/my.cnf')
             else:
                 connection = pymysql.connect(read_default_file='~/.my.cnf')
             return connection