Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-30 22:34:15 -05:00
Code Issues Activity

caddyhttp: Always provision ACME issuers (fix terms agree error)

Browse source
This commit is contained in:
Matthew Holt 2020-03-23 12:21:39 -06:00
parent 348cb798e2
commit 4c43bf8cc8
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/caddyhttp/autohttps.go
View file

@ -551,7 +551,6 @@ func (app *App) createAutomationPolicies(ctx caddy.Context, publicNames, interna
// config values. If any changes are made, acmeIssuer is // config values. If any changes are made, acmeIssuer is
// reprovisioned. acmeIssuer must not be nil. // reprovisioned. acmeIssuer must not be nil.
func (app *App) fillInACMEIssuer(acmeIssuer *caddytls.ACMEIssuer) error { func (app *App) fillInACMEIssuer(acmeIssuer *caddytls.ACMEIssuer) error {
var anyChanges bool
if app.HTTPPort > 0 || app.HTTPSPort > 0 { if app.HTTPPort > 0 || app.HTTPSPort > 0 {
if acmeIssuer.Challenges == nil { if acmeIssuer.Challenges == nil {
acmeIssuer.Challenges = new(caddytls.ChallengesConfig) acmeIssuer.Challenges = new(caddytls.ChallengesConfig)
@ -564,7 +563,6 @@ func (app *App) fillInACMEIssuer(acmeIssuer *caddytls.ACMEIssuer) error {
// don't overwrite existing explicit config // don't overwrite existing explicit config
if acmeIssuer.Challenges.HTTP.AlternatePort == 0 { if acmeIssuer.Challenges.HTTP.AlternatePort == 0 {
acmeIssuer.Challenges.HTTP.AlternatePort = app.HTTPPort acmeIssuer.Challenges.HTTP.AlternatePort = app.HTTPPort
anyChanges = true
} }
} }
if app.HTTPSPort > 0 { if app.HTTPSPort > 0 {
@ -574,13 +572,14 @@ func (app *App) fillInACMEIssuer(acmeIssuer *caddytls.ACMEIssuer) error {
// don't overwrite existing explicit config // don't overwrite existing explicit config
if acmeIssuer.Challenges.TLSALPN.AlternatePort == 0 { if acmeIssuer.Challenges.TLSALPN.AlternatePort == 0 {
acmeIssuer.Challenges.TLSALPN.AlternatePort = app.HTTPSPort acmeIssuer.Challenges.TLSALPN.AlternatePort = app.HTTPSPort
anyChanges = true
} }
} }
if anyChanges { // we must provision all ACME issuers, even if nothing
return acmeIssuer.Provision(app.ctx) // was changed, because we don't know if they are new
} // and haven't been provisioned yet; if an ACME issuer
return nil // never gets provisioned, its Agree field stays false,
// which leads to, um, problems later on
return acmeIssuer.Provision(app.ctx)
} }
// automaticHTTPSPhase2 begins certificate management for // automaticHTTPSPhase2 begins certificate management for