diff --git a/certbot/src/certbot/_internal/plugins/apache/apache_util.py b/certbot/src/certbot/_internal/plugins/apache/apache_util.py index ff3542f6c..9ad8db84c 100644 --- a/certbot/src/certbot/_internal/plugins/apache/apache_util.py +++ b/certbot/src/certbot/_internal/plugins/apache/apache_util.py @@ -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))) diff --git a/certbot/src/certbot/_internal/plugins/nginx/configurator.py b/certbot/src/certbot/_internal/plugins/nginx/configurator.py index 23d725574..a53610219 100644 --- a/certbot/src/certbot/_internal/plugins/nginx/configurator.py +++ b/certbot/src/certbot/_internal/plugins/nginx/configurator.py @@ -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))) diff --git a/certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py b/certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py index 944520eb4..07888dbe7 100644 --- a/certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py +++ b/certbot/src/certbot/_internal/tests/plugins/apache/configurator_test.py @@ -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')] diff --git a/certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py b/certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py index 290ebcb94..95ffbd35b 100644 --- a/certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py +++ b/certbot/src/certbot/_internal/tests/plugins/nginx/configurator_test.py @@ -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))