diff options
| -rw-r--r-- | data/modules.example.conf | 16 | ||||
| -rw-r--r-- | modules/extra/m_ssl_gnutls.cpp | 4 | ||||
| -rw-r--r-- | modules/extra/m_ssl_openssl.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/data/modules.example.conf b/data/modules.example.conf index 1b8563ddb..f1706e7b3 100644 --- a/data/modules.example.conf +++ b/data/modules.example.conf @@ -584,12 +584,12 @@ module { name = "m_sasl" } * * You can generate your own certificate and key pair by using: * - * certtool --generate-privkey --bits 2048 --outfile anope.key - * certtool --generate-self-signed --load-privkey anope.key --outfile anope.crt + * certtool --generate-privkey --bits 2048 --outfile privkey.pem + * certtool --generate-self-signed --load-privkey privkey.pem --outfile fullchain.pem * */ - cert = "data/anope.crt" - key = "data/anope.key" + cert = "data/fullchain.pem" + key = "data/privkey.pem" /* * Diffie-Hellman parameters to use when acting as a server. This is only @@ -623,11 +623,11 @@ module { name = "m_sasl" } * * You can generate your own certificate and key pair by using: * - * openssl genrsa -out anope.key 2048 - * openssl req -new -x509 -key anope.key -out anope.crt -days 1095 + * openssl genrsa -out privkey.pem 2048 + * openssl req -new -x509 -key privkey.pem -out fullchain.pem -days 1095 */ - cert = "data/anope.crt" - key = "data/anope.key" + cert = "data/fullchain.pem" + key = "data/privkey.pem" /* * As of 2014 SSL 3.0 is considered insecure, but it might be enabled diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/m_ssl_gnutls.cpp index c7595c9ed..e9b690940 100644 --- a/modules/extra/m_ssl_gnutls.cpp +++ b/modules/extra/m_ssl_gnutls.cpp @@ -334,8 +334,8 @@ public: { Configuration::Block *config = conf->GetModule(this); - const Anope::string certfile = config->Get<const Anope::string>("cert", "data/anope.crt"); - const Anope::string keyfile = config->Get<const Anope::string>("key", "data/anope.key"); + const Anope::string certfile = config->Get<const Anope::string>("cert", "data/fullchain.pem"); + const Anope::string keyfile = config->Get<const Anope::string>("key", "data/privkey.pem"); const Anope::string dhfile = config->Get<const Anope::string>("dh", "data/dhparams.pem"); CheckFile(certfile); diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/m_ssl_openssl.cpp index dca68f9f9..52959afee 100644 --- a/modules/extra/m_ssl_openssl.cpp +++ b/modules/extra/m_ssl_openssl.cpp @@ -142,8 +142,8 @@ public: { Configuration::Block *config = conf->GetModule(this); - this->certfile = config->Get<const Anope::string>("cert", "data/anope.crt"); - this->keyfile = config->Get<const Anope::string>("key", "data/anope.key"); + this->certfile = config->Get<const Anope::string>("cert", "data/fullchain.pem"); + this->keyfile = config->Get<const Anope::string>("key", "data/privkey.pem"); if (Anope::IsFile(this->certfile.c_str())) { |