fixup some acme related things

api/server/acme/certmagic/certmagic.go

@@ -13,7 +13,7 @@ import (
 )
 
 type certmagicProvider struct {
-	opts *acme.Options
+	opts acme.Options
 }
 
 func (c *certmagicProvider) NewListener(ACMEHosts ...string) (net.Listener, error) {
@@ -40,23 +40,19 @@ func (c *certmagicProvider) NewListener(ACMEHosts ...string) (net.Listener, erro
 
 // New returns a certmagic provider
 func New(options ...acme.Option) acme.Provider {
-	o := &acme.Options{}
+	opts := acme.DefaultOptions()
-	if len(options) == 0 {
+
-		for _, op := range acme.Default() {
+	for _, o := range options {
-			op(o)
+		o(&opts)
-		}
-	} else {
-		for _, op := range options {
-			op(o)
-		}
 	}
-	if o.Cache != nil {
+
-		if _, ok := o.Cache.(certmagic.Storage); !ok {
+	if opts.Cache != nil {
+		if _, ok := opts.Cache.(certmagic.Storage); !ok {
 			log.Fatal("ACME: cache provided doesn't implement certmagic's Storage interface")
 		}
 	}
 
 	return &certmagicProvider{
-		opts: o,
+		opts: opts,
 	}
 }

api/server/acme/certmagic/storage.go

@@ -89,7 +89,7 @@ func (s *storage) Exists(key string) bool {
 }
 
 func (s *storage) List(prefix string, recursive bool) ([]string, error) {
-	records, err := s.store.Sync()
+	records, err := s.store.List()
 	if err != nil {
 		return nil, err
 	}

api/server/acme/options.go

@@ -63,11 +63,11 @@ func Cache(c interface{}) Option {
 	}
 }
 
-// Default uses the Let's Encrypt Production CA, with DNS Challenge disabled.
+// DefaultOptions uses the Let's Encrypt Production CA, with DNS Challenge disabled.
-func Default() []Option {
+func DefaultOptions() Options {
-	return []Option{
+	return Options{
-		AcceptToS(true),
+		AcceptToS: true,
-		CA(LetsEncryptProductionCA),
+		CA: LetsEncryptProductionCA,
-		OnDemand(true),
+		OnDemand: true,
 	}
 }