aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
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/worldserver
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/worldserver')
-rw-r--r--src/server/worldserver/worldserver.conf.dist4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index f008f531449..3f3d7e0f345 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -88,7 +88,7 @@ LogsDir = ""
# WorldDatabaseInfo
# CharacterDatabaseInfo
# Description: Database connection settings for the world server.
-# Example: "hostname;port;username;password;database"
+# Example: "hostname;port;username;password;database;ssl"
# ".;some_number;username;password;database" - (Use named pipes on Windows
# "enable-named-pipe" to [mysqld]
# section my.ini)
@@ -103,6 +103,8 @@ LogsDir = ""
# search for TCE00016 on forum.
# Don't open port on firewall to external connections (it belongs to MySQL, not to wow server).
# The username you choose must have permissions to create/alter/rename tables.
+# The SSL option will enable TLS when connecting to the specified database. If not provided or
+# any value other than 'ssl' is set, TLS will not be used.
LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
WorldDatabaseInfo = "127.0.0.1;3306;trinity;trinity;world"