From ed40a5dcab80f17d63c3fba83349004eac3c7930 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Thu, 12 Sep 2019 17:31:54 -0600
Subject: tls: Do away with SetDefaults which did nothing useful

CertMagic uses the same defaults for us
---
 modules/caddyhttp/caddyhttp.go  |  1 -
 modules/caddytls/acmemanager.go | 24 ------------------------
 modules/caddytls/tls.go         |  4 +---
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/modules/caddyhttp/caddyhttp.go b/modules/caddyhttp/caddyhttp.go
index 693f416..b6a8148 100644
--- a/modules/caddyhttp/caddyhttp.go
+++ b/modules/caddyhttp/caddyhttp.go
@@ -337,7 +337,6 @@ func (app *App) automaticHTTPS() error {
 					},
 				},
 			}
-			acmeManager.SetDefaults()
 			tlsApp.Automation.Policies = append(tlsApp.Automation.Policies,
 				caddytls.AutomationPolicy{
 					Hosts:      domainsForCerts,
diff --git a/modules/caddytls/acmemanager.go b/modules/caddytls/acmemanager.go
index b717268..0482ce3 100644
--- a/modules/caddytls/acmemanager.go
+++ b/modules/caddytls/acmemanager.go
@@ -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.
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 93a05be..bbcf61e 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -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
-- 
cgit v1.2.3