From 6d0e780f951789cdac7f9f60ca5b373ab8d44ca1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 26 Jan 2016 18:57:38 +0100 Subject: Switch to lib-internal solver --- cmd/acme/main.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 67271b8..00c209f 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -63,9 +63,6 @@ func satisfice(des *desire) error { } } - hs := &httpChallenge{Webroot: des.Webroot} - des.RegisterSolver(acme.ChallengeHTTP, hs) - err = des.provider.Authz(des.account, des.Desire) if err != nil { return err @@ -92,8 +89,17 @@ func main() { if err := prepare(conf); err != nil { log.Fatal(err) } - httpSolver(conf.Defaults.Listen) + + httpSol := acme.NewHTTPSolver(conf.Defaults.Listen) + for k, des := range conf.Desire { + if des.Webroot != "" { + wrSol := acme.NewWebrootSolver(des.Webroot) + des.RegisterSolver(acme.ChallengeHTTP, wrSol) + } else { + des.RegisterSolver(acme.ChallengeHTTP, httpSol) + } + log.Println("satisfice", k) if err := satisfice(des); err != nil { log.Fatal(err) -- cgit v1.2.3