From ff2aec58ecce937232840391177e4f10d42e4085 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 10 Mar 2016 09:45:01 +0100 Subject: Drop Desire type --- cmd/acme/main.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index cda91e0..b6ee054 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -84,17 +84,22 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error { } } - des := acme.NewDesire() + sols := make(acme.Solvers) + if d.Webroot != "" { - des.RegisterSolver(acme.NewWebrootSolver(d.Webroot)) + sols[acme.ChallengeHTTP] = acme.NewWebrootSolver(d.Webroot) } else { - des.RegisterSolver(httpSol) - des.RegisterSolver(tlsSol) + if httpSol != nil { + sols[acme.ChallengeHTTP] = httpSol + } + if tlsSol != nil { + sols[acme.ChallengeTLS] = tlsSol + } } for _, an := range d.Altnames { log.Println("Authorize", an) - if err := prov.Authorize(acc, des, an); err != nil { + if err := prov.Authorize(acc, sols, an); err != nil { return err } } -- cgit v1.2.3