From a97bcf8caaf0827261313d1497156912433418fc Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 24 Sep 2022 18:24:14 -0700
Subject: [PATCH] Switch to python-mariadb-connector

The most recent version of python-mysql-connector wasn't able to connect
to the server due to the utf8 encoding
---
 scripts/wk/cfg/osticket.py | 2 +-
 scripts/wk/osticket.py     | 4 ++--
 setup/linux/packages/aur   | 2 ++
 setup/linux/packages/base  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/wk/cfg/osticket.py b/scripts/wk/cfg/osticket.py
index b5ec7655..e2337360 100644
--- a/scripts/wk/cfg/osticket.py
+++ b/scripts/wk/cfg/osticket.py
@@ -4,7 +4,7 @@
 SQL = {
   'DB':         'osticket',
   'Host':       'osticket.1201.com',
-  'Port':       '3306',
+  'Port':       3306,
   'User':       'wizardkit',
   'Pass':       'U9bJnF9eamVkfsVw',
   }
diff --git a/scripts/wk/osticket.py b/scripts/wk/osticket.py
index c38be02e..b5a77941 100644
--- a/scripts/wk/osticket.py
+++ b/scripts/wk/osticket.py
@@ -6,7 +6,7 @@ import logging
 import socket
 import time
 
-import mysql.connector as mariadb
+import mariadb
 
 from wk import std
 from wk.cfg.osticket import SQL, STAFF, TEST_STATIONS
@@ -59,7 +59,7 @@ class osTicket(): # pylint: disable=invalid-name
         database=SQL['DB'],
         user=SQL['User'],
         password=SQL['Pass'],
-        connection_timeout=5,
+        connect_timeout=5,
         )
       self.db_cursor = self.db_connection.cursor()
     except mariadb.errors.Error:
diff --git a/setup/linux/packages/aur b/setup/linux/packages/aur
index 297a850b..cc80e928 100644
--- a/setup/linux/packages/aur
+++ b/setup/linux/packages/aur
@@ -3,10 +3,12 @@ ddrescueview-bin
 hardinfo-gtk3
 hfsprogs
 iwgtk
+mariadb-connector-c
 memtest86-efi
 mprime
 openbox-patched
 pipes.sh
+python-mariadb-connector
 smartmontools-svn
 testdisk-wip
 ttf-font-awesome-4
diff --git a/setup/linux/packages/base b/setup/linux/packages/base
index 306bfffd..ebf6dfcb 100644
--- a/setup/linux/packages/base
+++ b/setup/linux/packages/base
@@ -65,7 +65,7 @@ pv
 python
 python-docopt
 python-gnuplot
-python-mysql-connector
+python-mariadb-connector
 python-psutil
 python-pytz
 python-requests