merge certbot-apache and certbot-nginx into certbot (#10522)

based on the suggestion @bmw made in #10484, this moves nearly
everything from `certbot-apache` and `certbot-nginx` into subdirectories
in `certbot/src/certbot/_internal`, and corresponding "extra"
dependencies are made for the certbot distribution. in their place,
entrypoint shims are made in the old distributions.

this way, installing `certbot[nginx]` will pull in the extra
dependencies needed for the nginx code, and also pull in the shim in
`certbot-nginx`, letting our plugin discovery system work just as it did
before. ditto for apache.

note that this doesn't yet deprecate anything, which was one of the
primary goals of the original issue -- i spun out that work into #10521

fixes #10484

---------

Co-authored-by: Brad Warren <bmw@users.noreply.github.com>
Co-authored-by: ohemorange <erica@eff.org>
This commit is contained in:
Will Greenberg
2026-03-23 18:09:04 -07:00
committed by GitHub
co-authored by Brad Warren ohemorange
parent 9599364837
commit 6f1c0b0abd
309 changed files with 700 additions and 648 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ Right now, this is data for the roundtrip test (checking that the parser
can parse each file and that the reserialized config file it generates is
identical to the original).
If run in a virtualenv or otherwise so that certbot_nginx can be imported,
If run in a virtualenv or otherwise so that certbot can be imported,
the roundtrip test can run as
python roundtrip.py nginx-roundtrip-testdata
@@ -3,7 +3,7 @@
import os
import sys
from certbot_nginx._internal import nginxparser
from certbot._internal.plugins.nginx import nginxparser
def roundtrip(stuff):