diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-10 14:05:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-10 14:05:30 +0200 |
| commit | 500d5db81e39e968f1e6b56cf29d3ee78bc24f5e (patch) | |
| tree | 0819959d30a94fd2c8d838d27c6724bd6b540ad1 | |
| parent | 43c3b1b2e06b2fe4b85cd1a4e892584147b4828e (diff) | |
Renamed PublicKeyFile -> CertificatesFile
| -rw-r--r-- | src/server/bnetserver/Server/SslContext.cpp | 4 | ||||
| -rw-r--r-- | src/server/bnetserver/bnetserver.conf.dist | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/bnetserver/Server/SslContext.cpp b/src/server/bnetserver/Server/SslContext.cpp index b4287eedc5f..52cf299206a 100644 --- a/src/server/bnetserver/Server/SslContext.cpp +++ b/src/server/bnetserver/Server/SslContext.cpp @@ -30,11 +30,11 @@ bool Battlenet::SslContext::Initialize() return false; \ } } while (0) - std::string publicKeyFile = sConfigMgr->GetStringDefault("PublicKeyFile", "./bnetserver.cert.pem"); + std::string certificateChainFile = sConfigMgr->GetStringDefault("CertificatesFile", "./bnetserver.cert.pem"); std::string privateKeyFile = sConfigMgr->GetStringDefault("PrivateKeyFile", "./bnetserver.key.pem"); LOAD_CHECK(instance().set_options(boost::asio::ssl::context::no_sslv3, err)); - LOAD_CHECK(instance().use_certificate_chain_file(publicKeyFile, err)); + LOAD_CHECK(instance().use_certificate_chain_file(certificateChainFile, err)); LOAD_CHECK(instance().use_private_key_file(privateKeyFile, boost::asio::ssl::context::pem, err)); #undef LOAD_CHECK diff --git a/src/server/bnetserver/bnetserver.conf.dist b/src/server/bnetserver/bnetserver.conf.dist index edad0779662..f88d6fd1d1d 100644 --- a/src/server/bnetserver/bnetserver.conf.dist +++ b/src/server/bnetserver/bnetserver.conf.dist @@ -87,12 +87,12 @@ BindIP = "0.0.0.0" PidFile = "" # -# PublicKeyFile -# Description: Public key file. +# CertificatesFile +# Description: Certificates file. # Example: "/etc/ssl/certs/bnetserver.cert.pem" # Default: "./bnetserver.cert.pem" -PublicKeyFile = "./bnetserver.cert.pem" +CertificatesFile = "./bnetserver.cert.pem" # # PrivateKeyFile |