Make changes to fix issue 13

caddynet/netserver/tls.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/mholt/caddy"
 	"github.com/mholt/caddy/caddytls"
+	"github.com/mholt/certmagic"
 )
 
 // activateTLS
@@ -30,7 +31,7 @@ func activateTLS(cctx caddy.Context) error {
 	// 3. Calls ObtainCert() for each config (this method only obtains certificates if the config qualifies and has its Managed field set to true).
 	// place certificates and keys on disk
 	for _, c := range ctx.configs {
-		err := c.TLS.ObtainCert(c.TLS.Hostname, operatorPresent)
+		err := c.TLS.Manager.ObtainCert(c.TLS.Hostname, operatorPresent)
 		if err != nil {
 			return err
 		}
@@ -44,8 +45,8 @@ func activateTLS(cctx caddy.Context) error {
 			continue
 		}
 		cfg.TLS.Enabled = true
-		if caddytls.HostQualifies(cfg.Hostname) {
-			_, err := cfg.TLS.CacheManagedCertificate(cfg.Hostname)
+		if certmagic.HostQualifies(cfg.Hostname) {
+			_, err := cfg.TLS.Manager.CacheManagedCertificate(cfg.Hostname)
 			if err != nil {
 				return err
 			}
@@ -61,9 +62,22 @@ func activateTLS(cctx caddy.Context) error {
 	// renew all relevant certificates that need renewal. this is important
 	// to do right away so we guarantee that renewals aren't missed, and
 	// also the user can respond to any potential errors that occur.
-	err := caddytls.RenewManagedCertificates(true)
-	if err != nil {
-		return err
+
+	// renew all relevant certificates that need renewal. this is important
+	// to do right away so we guarantee that renewals aren't missed, and
+	// also the user can respond to any potential errors that occur.
+	// (skip if upgrading, because the parent process is likely already listening
+	// on the ports we'd need to do ACME before we finish starting; parent process
+	// already running renewal ticker, so renewal won't be missed anyway.)
+	if !caddy.IsUpgrade() {
+		ctx.instance.StorageMu.RLock()
+		certCache, ok := ctx.instance.Storage[caddytls.CertCacheInstStorageKey].(*certmagic.Cache)
+		ctx.instance.StorageMu.RUnlock()
+		if ok && certCache != nil {
+			if err := certCache.RenewManagedCertificates(operatorPresent); err != nil {
+				return err
+			}
+		}
 	}
 
 	if !caddy.Quiet && operatorPresent {