diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-09-30 09:07:43 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-09-30 09:07:43 -0600 |
| commit | b249b45d109cdfef51b94cdeeb1ef7593e3b26ab (patch) | |
| tree | ad2798d7da52653fd477088c56300f288de89d6f /modules/caddyhttp/caddyhttp.go | |
| parent | c12bf4054c37b88eb37f7c59631d55ae512bcd29 (diff) | |
tls: Change struct fields to pointers, add nil checks; rate.Burst update
Making them pointers makes for cleaner JSON when adapting configs, if
the struct is empty now it will be omitted entirely.
The x/time/rate package was updated to support changing the burst, so
we've incorporated that here and removed a TODO.
Diffstat (limited to 'modules/caddyhttp/caddyhttp.go')
| -rw-r--r-- | modules/caddyhttp/caddyhttp.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go index c4320cc..410b42c 100644 --- a/modules/caddyhttp/caddyhttp.go +++ b/modules/caddyhttp/caddyhttp.go @@ -329,15 +329,18 @@ func (app *App) automaticHTTPS() error { // to tell the TLS app to manage these certs by honoring // those port configurations acmeManager := &caddytls.ACMEManagerMaker{ - Challenges: caddytls.ChallengesConfig{ - HTTP: caddytls.HTTPChallengeConfig{ + Challenges: &caddytls.ChallengesConfig{ + HTTP: &caddytls.HTTPChallengeConfig{ AlternatePort: app.HTTPPort, // we specifically want the user-configured port, if any }, - TLSALPN: caddytls.TLSALPNChallengeConfig{ + TLSALPN: &caddytls.TLSALPNChallengeConfig{ AlternatePort: app.HTTPSPort, // we specifically want the user-configured port, if any }, }, } + if tlsApp.Automation == nil { + tlsApp.Automation = new(caddytls.AutomationConfig) + } tlsApp.Automation.Policies = append(tlsApp.Automation.Policies, caddytls.AutomationPolicy{ Hosts: domainsForCerts, |