From 4a428ebda4ef689a87f96cb7f884f23d00e3e8d9 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Thu, 11 Dec 2025 13:11:20 -0800 Subject: [PATCH] Add entrypoints for nginx/apache shims --- certbot-apache/src/certbot_apache/_internal/entrypoint.py | 6 ++++++ certbot-nginx/pyproject.toml | 2 +- certbot-nginx/src/certbot_nginx/_internal/entrypoint.py | 6 ++++++ certbot/src/certbot/_internal/apache/entrypoint.py | 3 --- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 certbot-apache/src/certbot_apache/_internal/entrypoint.py create mode 100644 certbot-nginx/src/certbot_nginx/_internal/entrypoint.py diff --git a/certbot-apache/src/certbot_apache/_internal/entrypoint.py b/certbot-apache/src/certbot_apache/_internal/entrypoint.py new file mode 100644 index 000000000..7363f7770 --- /dev/null +++ b/certbot-apache/src/certbot_apache/_internal/entrypoint.py @@ -0,0 +1,6 @@ +""" Entry point for Apache Plugin """ + +from certbot._internal.apache import entrypoint + + +ENTRYPOINT = entrypoint.get_configurator() diff --git a/certbot-nginx/pyproject.toml b/certbot-nginx/pyproject.toml index f3129ba38..917891019 100644 --- a/certbot-nginx/pyproject.toml +++ b/certbot-nginx/pyproject.toml @@ -38,7 +38,7 @@ test = [ ] [project.entry-points."certbot.plugins"] -nginx = "certbot_nginx._internal.configurator:NginxConfigurator" +nginx = "certbot_nginx._internal.entrypoint:ENTRYPOINT" [project.urls] Homepage = "https://github.com/certbot/certbot" diff --git a/certbot-nginx/src/certbot_nginx/_internal/entrypoint.py b/certbot-nginx/src/certbot_nginx/_internal/entrypoint.py new file mode 100644 index 000000000..db4278ba2 --- /dev/null +++ b/certbot-nginx/src/certbot_nginx/_internal/entrypoint.py @@ -0,0 +1,6 @@ +""" Entry point for Apache Plugin """ + +from certbot._internal.nginx import configurator + + +ENTRYPOINT = configurator.NginxConfigurator diff --git a/certbot/src/certbot/_internal/apache/entrypoint.py b/certbot/src/certbot/_internal/apache/entrypoint.py index 7c68bd54d..44d6ccb2a 100644 --- a/certbot/src/certbot/_internal/apache/entrypoint.py +++ b/certbot/src/certbot/_internal/apache/entrypoint.py @@ -64,6 +64,3 @@ def get_configurator() -> type[configurator.ApacheConfigurator]: # No override class found, return the generic configurator override_class = configurator.ApacheConfigurator return override_class - - -ENTRYPOINT = get_configurator()