From ce9bda74942fb130c5f85839aa93a90abe971132 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 8 Jan 2016 22:14:22 +0100 Subject: Move solver into desire --- cmd/acme/main.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cmd/acme/main.go') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 4534542..1dbc496 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -3,6 +3,7 @@ package main import ( "flag" "log" + "net/http" "sync" "dim13.org/acme" @@ -80,14 +81,14 @@ func main() { } } - if des.Webroot != "" { - ws := &webrootChallenge{Webroot: des.Webroot} - acme.RegisterSolver(acme.ChallengeHTTP, ws) - } else { - // TODO des.Register - hs := &httpChallenge{Addr: conf.Defaults.Listen} - acme.RegisterSolver(acme.ChallengeHTTP, hs) + // TODO des.Register + hs := &httpChallenge{ + Server: http.Server{ + Addr: conf.Defaults.Listen, + }, + Webroot: des.Webroot, } + acme.RegisterSolver(acme.ChallengeHTTP, hs) wg.Add(1) go func(k string, des *desire) { -- cgit v1.2.3