From 75df2283c329fa9e1fc02fbb4744d5be52b31c08 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 6 Sep 2019 12:07:34 +0200
Subject: [PATCH] Fix MySQL Install

---
 wo/cli/plugins/stack.py |  1 +
 wo/core/apt_repo.py     | 18 +++++++++++++++---
 wo/core/variables.py    |  6 ++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index a0d8ebd..c1e9b02 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -11,6 +11,7 @@ import string
 
 import psutil
 import requests
+
 from cement.core import handler, hook
 from cement.core.controller import CementBaseController, expose
 
diff --git a/wo/core/apt_repo.py b/wo/core/apt_repo.py
index fed5bac..e024180 100644
--- a/wo/core/apt_repo.py
+++ b/wo/core/apt_repo.py
@@ -48,8 +48,9 @@ class WORepo():
                 Log.debug(self, "{0}".format(e))
                 Log.error(self, "Unable to add repo")
         if ppa is not None:
-            WOShellExec.cmd_exec(self, "LC_ALL=C.UTF-8 add-apt-repository -yu '{ppa_name}'"
-                                 .format(ppa_name=ppa))
+            WOShellExec.cmd_exec(
+                self, "LC_ALL=C.UTF-8 add-apt-repository -yu '{ppa_name}'"
+                .format(ppa_name=ppa))
 
     def remove(self, ppa=None, repo_url=None):
         """
@@ -77,7 +78,18 @@ class WORepo():
                 Log.debug(self, "{0}".format(e))
                 Log.error(self, "Unable to remove repo")
 
-    def add_key(self, keyids, keyserver=None):
+    def add_key(self, keyid, keyserver=None):
+        """
+        This function adds imports repository keys from keyserver.
+        default keyserver is hkp://keyserver.ubuntu.com
+        user can provide other keyserver with keyserver="hkp://xyz"
+        """
+        WOShellExec.cmd_exec(self, "apt-key adv --keyserver {serv}"
+                             .format(serv=(keyserver or
+                                           "hkp://keyserver.ubuntu.com")) +
+                             " --recv-keys {keys}".format(key=keyid))
+
+    def add_keys(self, keyids, keyserver=None):
         """
         This function adds imports repository keys from keyserver.
         default keyserver is hkp://keyserver.ubuntu.com
diff --git a/wo/core/variables.py b/wo/core/variables.py
index 22a8a17..e318e31 100644
--- a/wo/core/variables.py
+++ b/wo/core/variables.py
@@ -109,7 +109,7 @@ class WOVariables():
                          .format(wo_deb_repo))
 
     wo_nginx = ["nginx-custom", "nginx-wo"]
-    wo_nginx_key = ['188C9FB063F0247A']
+    wo_nginx_key = '188C9FB063F0247A'
 
     # PHP repo and packages
     if wo_distro == 'ubuntu':
@@ -118,7 +118,7 @@ class WOVariables():
         wo_php_repo = (
             "deb https://packages.sury.org/php/ {codename} main"
             .format(codename=wo_platform_codename))
-        wo_php_key = ['AC0E47584A7A714D']
+        wo_php_key = 'AC0E47584A7A714D'
 
     wo_php = ["php7.2-fpm", "php7.2-curl", "php7.2-gd", "php7.2-imap",
               "php7.2-readline", "php7.2-common", "php7.2-recode",
@@ -150,6 +150,8 @@ class WOVariables():
     else:
         wo_mysql_client = ["mariadb-client", "python3-mysql.connector"]
 
+    wo_mysql_keys = ['0xcbcb082a1bb943db', '0xF1656F24C74CD1D8']
+
     wo_fail2ban = ["fail2ban"]
     wo_clamav = ["clamav", "clamav-freshclam"]