Browse Source
tls: Do away with SetDefaults which did nothing useful
CertMagic uses the same defaults for us
master
Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
3 changed files with
1 additions and
28 deletions
-
modules/caddyhttp/caddyhttp.go
-
modules/caddytls/acmemanager.go
-
modules/caddytls/tls.go
|
|
@ -337,7 +337,6 @@ func (app *App) automaticHTTPS() error { |
|
|
|
}, |
|
|
|
}, |
|
|
|
} |
|
|
|
acmeManager.SetDefaults() |
|
|
|
tlsApp.Automation.Policies = append(tlsApp.Automation.Policies, |
|
|
|
caddytls.AutomationPolicy{ |
|
|
|
Hosts: domainsForCerts, |
|
|
|
|
|
@ -91,33 +91,9 @@ func (m *ACMEManagerMaker) Provision(ctx caddy.Context) error { |
|
|
|
m.Storage = nil // allow GC to deallocate - TODO: Does this help?
|
|
|
|
} |
|
|
|
|
|
|
|
m.SetDefaults() |
|
|
|
|
|
|
|
return nil |
|
|
|
} |
|
|
|
|
|
|
|
// SetDefaults sets necessary values that are
|
|
|
|
// currently empty to their default values.
|
|
|
|
func (m *ACMEManagerMaker) SetDefaults() { |
|
|
|
// TODO: Setting all these defaults might not be necessary
|
|
|
|
// since CertMagic should fill them in for us...
|
|
|
|
if m.CA == "" { |
|
|
|
m.CA = certmagic.Default.CA |
|
|
|
} |
|
|
|
if m.Email == "" { |
|
|
|
m.Email = certmagic.Default.Email |
|
|
|
} |
|
|
|
if m.RenewAhead == 0 { |
|
|
|
m.RenewAhead = caddy.Duration(certmagic.Default.RenewDurationBefore) |
|
|
|
} |
|
|
|
if m.keyType == "" { |
|
|
|
m.keyType = certmagic.Default.KeyType |
|
|
|
} |
|
|
|
if m.storage == nil { |
|
|
|
m.storage = certmagic.Default.Storage |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// makeCertMagicConfig converts m into a certmagic.Config, because
|
|
|
|
// this is a special case where the default manager is the certmagic
|
|
|
|
// Config and not a separate manager.
|
|
|
|
|
|
@ -197,9 +197,7 @@ func (t *TLS) getAutomationPolicyForName(name string) AutomationPolicy { |
|
|
|
} |
|
|
|
|
|
|
|
// default automation policy
|
|
|
|
mgmt := new(ACMEManagerMaker) |
|
|
|
mgmt.SetDefaults() |
|
|
|
return AutomationPolicy{Management: mgmt} |
|
|
|
return AutomationPolicy{Management: new(ACMEManagerMaker)} |
|
|
|
} |
|
|
|
|
|
|
|
// CertificatesWithSAN returns the list of all certificates
|
|
|
|