aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Updater/DBUpdater.cpp
diff options
context:
space:
mode:
authormyuzhobcplidtkieno <62526817+myuzhobcplidtkieno@users.noreply.github.com>2020-04-08 08:08:28 +1200
committerGitHub <noreply@github.com>2020-04-07 22:08:28 +0200
commitae553f89664a4baade80020856c9ff66323de963 (patch)
tree69b7dda1d45450008c237bcd39a63bc471ec7c0c /src/server/database/Updater/DBUpdater.cpp
parentdcd2ffdaf4c358dbbab7915ab744871e5a7cc4ad (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>
Diffstat (limited to 'src/server/database/Updater/DBUpdater.cpp')
-rw-r--r--src/server/database/Updater/DBUpdater.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp
index dca6d034784..bc83e0fe43e 100644
--- a/src/server/database/Updater/DBUpdater.cpp
+++ b/src/server/database/Updater/DBUpdater.cpp
@@ -188,7 +188,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&)
{
@@ -323,12 +323,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);
@@ -372,6 +373,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);