upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-02-20 00:10:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix more paths

Browse source
This commit is contained in:
Will Greenberg 2026-01-13 17:17:37 -08:00
parent a0998b155f
commit 34715744f8
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
certbot/src/certbot/_internal/plugins/apache/apache_util.py
View file

@ -249,6 +249,6 @@ def find_ssl_apache_conf(prefix: str) -> str:
file_manager = ExitStack()
atexit.register(file_manager.close)
ref = (importlib.resources.files("certbot").joinpath("_internal")
.joinpath("apache").joinpath("tls_configs")
.joinpath("plugins").joinpath("apache").joinpath("tls_configs")
.joinpath("{0}-options-ssl-apache.conf".format(prefix)))
return str(file_manager.enter_context(importlib.resources.as_file(ref)))

3
certbot/src/certbot/_internal/plugins/nginx/configurator.py
View file

@ -174,7 +174,8 @@ class NginxConfigurator(common.Configurator):
file_manager = ExitStack()
atexit.register(file_manager.close)
ref = (importlib.resources.files("certbot").joinpath("_internal")
.joinpath("nginx").joinpath("tls_configs").joinpath(config_filename))
.joinpath("plugins").joinpath("nginx").joinpath("tls_configs")
.joinpath(config_filename))
return str(file_manager.enter_context(importlib.resources.as_file(ref)))

2
certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py
View file

@ -1704,7 +1704,7 @@ class InstallSslOptionsConfTest(util.ApacheTest):
from certbot._internal.plugins.apache.constants import ALL_SSL_OPTIONS_HASHES
ref = importlib.resources.files("certbot") / "_internal" / "apache" / "tls_configs"
ref = importlib.resources.files("certbot") / "_internal" / "plugins" /"apache" / "tls_configs"
with importlib.resources.as_file(ref) as tls_configs_dir:
all_files = [os.path.join(tls_configs_dir, name) for name in os.listdir(tls_configs_dir)
if name.endswith('options-ssl-apache.conf')]

2
certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py
View file

@ -1116,7 +1116,7 @@ class InstallSslOptionsConfTest(util.NginxTest):
from certbot._internal.plugins.nginx.constants import ALL_SSL_OPTIONS_HASHES
tls_configs_ref = importlib.resources.files("certbot").joinpath(
"_internal", "nginx", "tls_configs")
"_internal", "plugins", "nginx", "tls_configs")
with importlib.resources.as_file(tls_configs_ref) as tls_configs_dir:
for tls_config_file in os.listdir(tls_configs_dir):
file_hash = crypto_util.sha256sum(os.path.join(tls_configs_dir, tls_config_file))