Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 14:30 UTC
caddytls: Remove shim code supporting deprecated lego-dns (#6231)
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Aziz Rmadi committed
Apr 15, 2024 at 16:26 UTC
3609a4af75a646cbc83f7eecdf25498170306464
1 file changed
+9
-22
modules/caddytls/acmeissuer.go
+9
-22
@@ -28,7 +28,6 @@ import (
28
29
"github.com/caddyserver/certmagic"
30
"github.com/caddyserver/zerossl"
31
- "github.com/mholt/acmez/v2"
31
"github.com/mholt/acmez/v2/acme"
32
"go.uber.org/zap"
33
@@ -135,27 +134,15 @@ func (iss *ACMEIssuer) Provision(ctx caddy.Context) error {
134
if err != nil {
135
return fmt.Errorf("loading DNS provider module: %v", err)
136
}
138
-
139
- if deprecatedProvider, ok := val.(acmez.Solver); ok {
140
- // TODO: For a temporary amount of time, we are allowing the use of DNS
141
- // providers from go-acme/lego since there are so many providers implemented
142
- // using that API -- they are adapted as an all-in-one Caddy module in this
143
- // repository: https://github.com/caddy-dns/lego-deprecated - the module is a
144
- // acmez.Solver type, so we use it directly. The user must set environment
145
- // variables to configure it. Remove this shim once a sufficient number of
146
- // DNS providers are implemented for the libdns APIs instead.
147
- iss.Challenges.DNS.solver = deprecatedProvider
148
- } else {
149
- iss.Challenges.DNS.solver = &certmagic.DNS01Solver{
150
- DNSManager: certmagic.DNSManager{
151
- DNSProvider: val.(certmagic.DNSProvider),
152
- TTL: time.Duration(iss.Challenges.DNS.TTL),
153
- PropagationDelay: time.Duration(iss.Challenges.DNS.PropagationDelay),
154
- PropagationTimeout: time.Duration(iss.Challenges.DNS.PropagationTimeout),
155
- Resolvers: iss.Challenges.DNS.Resolvers,
156
- OverrideDomain: iss.Challenges.DNS.OverrideDomain,
157
- },
158
- }
137
+ iss.Challenges.DNS.solver = &certmagic.DNS01Solver{
138
+ DNSManager: certmagic.DNSManager{
139
+ DNSProvider: val.(certmagic.DNSProvider),
140
+ TTL: time.Duration(iss.Challenges.DNS.TTL),
141
+ PropagationDelay: time.Duration(iss.Challenges.DNS.PropagationDelay),
142
+ PropagationTimeout: time.Duration(iss.Challenges.DNS.PropagationTimeout),
143
+ Resolvers: iss.Challenges.DNS.Resolvers,
144
+ OverrideDomain: iss.Challenges.DNS.OverrideDomain,
145
+ },
146
}
147
}
148