f6c049751d
As per analysis by mschorm on the upstream bugzilla: <https://bugzilla.redhat.com/show_bug.cgi?id=2144488#c2> the SSL tests were not really working properly. Even though we had a misconfigured mariadb server for tests, it didn't complain until now. It already had been fixed for Fedora viac33b1cff59the commit contents were adjusted for the RHEL environemnt and mysql2 0.5.3 since the Fedora's commit is for mysql2 0.5.4. Additionally, enhance the DB connection check via:8b771a1ea9Related: RHEL-5584
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 15607011344b4f38306befeeebae2fa906dc4860 Mon Sep 17 00:00:00 2001
|
|
From: Jarek Prokop <jprokop@redhat.com>
|
|
Date: Fri, 8 Mar 2024 12:36:46 +0100
|
|
Subject: [PATCH] Backport "Use the SSL pem files in the Git repository." to
|
|
0.5.3.
|
|
|
|
Backport patch from Fedora
|
|
<https://src.fedoraproject.org/rpms/rubygem-mysql2/c/c33b1cff596b301b49c76f4307ab87390c681f30>
|
|
to resolve failing to start mariadb with SSL.
|
|
---
|
|
spec/mysql2/client_spec.rb | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
|
|
index 5a3b8a2..f2f7bec 100644
|
|
--- a/spec/mysql2/client_spec.rb
|
|
+++ b/spec/mysql2/client_spec.rb
|
|
@@ -137,9 +137,9 @@ RSpec.describe Mysql2::Client do
|
|
ssl_client = nil
|
|
option_overrides = {
|
|
'host' => 'mysql2gem.example.com', # must match the certificates
|
|
- :sslkey => '/etc/mysql/client-key.pem',
|
|
- :sslcert => '/etc/mysql/client-cert.pem',
|
|
- :sslca => '/etc/mysql/ca-cert.pem',
|
|
+ :sslkey => 'spec/ssl/client-key.pem',
|
|
+ :sslcert => 'spec/ssl/client-cert.pem',
|
|
+ :sslca => 'spec/ssl/ca-cert.pem',
|
|
:sslcipher => 'DHE-RSA-AES256-SHA',
|
|
:sslverify => true,
|
|
}
|
|
--
|
|
2.43.0
|
|
|