From bfed2e1bf5cfb250e17e91566546b38b4b9a34d8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 19 Mar 2024 15:39:41 +0000 Subject: Use paths relative to data/conf in the config file. This was done in some places already but not consistently. Closes #349. --- modules/extra/ssl_gnutls.cpp | 6 +++--- modules/extra/ssl_openssl.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/extra/ssl_gnutls.cpp b/modules/extra/ssl_gnutls.cpp index 520f877c0..4d399feb9 100644 --- a/modules/extra/ssl_gnutls.cpp +++ b/modules/extra/ssl_gnutls.cpp @@ -329,9 +329,9 @@ public: { Configuration::Block *config = conf->GetModule(this); - const Anope::string certfile = config->Get("cert", "data/fullchain.pem"); - const Anope::string keyfile = config->Get("key", "data/privkey.pem"); - const Anope::string dhfile = config->Get("dh", "data/dhparams.pem"); + const Anope::string certfile = Anope::ExpandConfig(config->Get("cert", "fullchain.pem")); + const Anope::string keyfile = Anope::ExpandConfig(config->Get("key", "privkey.pem")); + const Anope::string dhfile = Anope::ExpandConfig(config->Get("dh", "dhparams.pem")); CheckFile(certfile); CheckFile(keyfile); diff --git a/modules/extra/ssl_openssl.cpp b/modules/extra/ssl_openssl.cpp index a052752ae..ec81e6ccb 100644 --- a/modules/extra/ssl_openssl.cpp +++ b/modules/extra/ssl_openssl.cpp @@ -146,8 +146,8 @@ public: { Configuration::Block *config = conf->GetModule(this); - this->certfile = config->Get("cert", "data/fullchain.pem"); - this->keyfile = config->Get("key", "data/privkey.pem"); + this->certfile = Anope::ExpandConfig(config->Get("cert", "fullchain.pem")); + this->keyfile = Anope::ExpandConfig(config->Get("key", "privkey.pem")); if (Anope::IsFile(this->certfile.c_str())) { -- cgit