Skip to content

Commit

Permalink
Renamed PublicKeyFile -> CertificatesFile
Browse files Browse the repository at this point in the history
  • Loading branch information
Shauren committed Apr 10, 2016
1 parent 43c3b1b commit 500d5db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/server/bnetserver/Server/SslContext.cpp
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/server/bnetserver/bnetserver.conf.dist
Expand Up @@ -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
Expand Down

0 comments on commit 500d5db

Please sign in to comment.