diff options
| author | myuzhobcplidtkieno <62526817+myuzhobcplidtkieno@users.noreply.github.com> | 2020-04-08 08:08:28 +1200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-01 01:07:52 +0100 |
| commit | de5f7ededeb7fdf87c7218196e611b6a9df225df (patch) | |
| tree | 1714f64910f1f844256edf46708cdb4f5090e847 /src/server/database/Updater/DBUpdater.cpp | |
| parent | d0e1794d995666ec6dd4995c481327264399d340 (diff) | |
Added the ability to use TLS when connecting to a database. (#24348)
* Added the ability to use TLS when connecting to a database.
* Trying to kickstart CI checks
* Revert the kickstart change
Co-authored-by: myuzhobcplidtkieno <myuzhobcplidtkieno@github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit ae553f89664a4baade80020856c9ff66323de963)
Diffstat (limited to 'src/server/database/Updater/DBUpdater.cpp')
| -rw-r--r-- | src/server/database/Updater/DBUpdater.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index d0ddfcaf9ab..61b82e91099 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -220,7 +220,7 @@ bool DBUpdater<T>::Create(DatabaseWorkerPool<T>& pool) try { DBUpdater<T>::ApplyFile(pool, pool.GetConnectionInfo()->host, pool.GetConnectionInfo()->user, pool.GetConnectionInfo()->password, - pool.GetConnectionInfo()->port_or_socket, "", temp); + pool.GetConnectionInfo()->port_or_socket, "", pool.GetConnectionInfo()->ssl, temp); } catch (UpdateException&) { @@ -355,12 +355,13 @@ template<class T> void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, Path const& path) { DBUpdater<T>::ApplyFile(pool, pool.GetConnectionInfo()->host, pool.GetConnectionInfo()->user, pool.GetConnectionInfo()->password, - pool.GetConnectionInfo()->port_or_socket, pool.GetConnectionInfo()->database, path); + pool.GetConnectionInfo()->port_or_socket, pool.GetConnectionInfo()->database, pool.GetConnectionInfo()->ssl, path); } template<class T> void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& host, std::string const& user, - std::string const& password, std::string const& port_or_socket, std::string const& database, Path const& path) + std::string const& password, std::string const& port_or_socket, std::string const& database, std::string const& ssl, + Path const& path) { std::vector<std::string> args; args.reserve(8); @@ -404,6 +405,9 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& hos // Set max allowed packet to 1 GB args.push_back("--max-allowed-packet=1GB"); + if (ssl == "ssl") + args.push_back("--ssl"); + // Database if (!database.empty()) args.push_back(database); |