diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-03-19 15:39:41 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-03-19 15:51:55 +0000 |
| commit | bfed2e1bf5cfb250e17e91566546b38b4b9a34d8 (patch) | |
| tree | ecf5ba2049ae1752cff533e060d2dce50983c04e /modules | |
| parent | e488f294a116224d8c7f89c6c4ebad2356ba7814 (diff) | |
Use paths relative to data/conf in the config file.
This was done in some places already but not consistently.
Closes #349.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/extra/ssl_gnutls.cpp | 6 | ||||
| -rw-r--r-- | modules/extra/ssl_openssl.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
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<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"); + const Anope::string certfile = Anope::ExpandConfig(config->Get<const Anope::string>("cert", "fullchain.pem")); + const Anope::string keyfile = Anope::ExpandConfig(config->Get<const Anope::string>("key", "privkey.pem")); + const Anope::string dhfile = Anope::ExpandConfig(config->Get<const Anope::string>("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<const Anope::string>("cert", "data/fullchain.pem"); - this->keyfile = config->Get<const Anope::string>("key", "data/privkey.pem"); + this->certfile = Anope::ExpandConfig(config->Get<const Anope::string>("cert", "fullchain.pem")); + this->keyfile = Anope::ExpandConfig(config->Get<const Anope::string>("key", "privkey.pem")); if (Anope::IsFile(this->certfile.c_str())) { |