diff options
Diffstat (limited to 'internal/server')
| -rw-r--r-- | internal/server/tls.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/internal/server/tls.go b/internal/server/tls.go index 9f22a5e..1c1073e 100644 --- a/internal/server/tls.go +++ b/internal/server/tls.go @@ -13,7 +13,7 @@ import ( "github.com/ardanlabs/conf/v3" "github.com/caddyserver/caddy/v2" "github.com/caddyserver/certmagic" - "github.com/libdns/acmedns" + "github.com/libdns/powerdns" certmagic_redis "github.com/pberkel/caddy-storage-redis" "gitlab.com/tozd/go/errors" ) @@ -26,13 +26,6 @@ type redisConfig struct { KeyPrefix string `conf:"default:certmagic"` } -type acmeConfig struct { - Username string `conf:"required"` - Password string `conf:"required"` - Subdomain string `conf:"required"` - ServerURL string `conf:"env:SERVER_URL,default:https://acme.alanpearce.eu"` -} - func (s *Server) serveTLS() (err error) { log := s.log.Named("tls") @@ -81,10 +74,10 @@ func (s *Server) serveTLS() (err error) { return errors.Wrap(err, "could not parse redis config") } - acme := &acmedns.Provider{} - _, err = conf.Parse("ACME", acme) + pdns := &powerdns.Provider{} + _, err = conf.Parse("POWERDNS", pdns) if err != nil { - return errors.Wrap(err, "could not parse ACME config") + return errors.Wrap(err, "could not parse PowerDNS ACME config") } issuer = certmagic.NewACMEIssuer(cfg, certmagic.ACMEIssuer{ @@ -94,7 +87,7 @@ func (s *Server) serveTLS() (err error) { Logger: certmagic.Default.Logger, DNS01Solver: &certmagic.DNS01Solver{ DNSManager: certmagic.DNSManager{ - DNSProvider: acme, + DNSProvider: pdns, Logger: certmagic.Default.Logger, }, }, @@ -102,8 +95,6 @@ func (s *Server) serveTLS() (err error) { certificateDomains = append(slices.Clone(s.config.Domains), wildcardDomain) - log.Info("acme", "username", acme.Username, "subdomain", acme.Subdomain, "server_url", acme.ServerURL) - rs := certmagic_redis.New() rs.Address = []string{rc.Address} rs.Username = rc.Username |