From 9650a1c86949890b991b144b667bd8424d511208 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 29 Jan 2016 12:29:14 +0100 Subject: Add guard --- cmd/acme/main.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 95b1418..7a144c0 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -88,21 +88,26 @@ func main() { httpSol, err := acme.NewHTTPSolver(conf.Defaults.Listen) if err != nil { - log.Fatal(err) + log.Println(err) } tlsSol, err := acme.NewTLSSolver(conf.Defaults.ListenTLS) if err != nil { - log.Fatal(err) + log.Println(err) } for k, des := range conf.Desire { if des.Webroot != "" { wrSol := acme.NewWebrootSolver(des.Webroot) des.RegisterSolver(acme.ChallengeHTTP, wrSol) - } else { + } else if httpSol != nil { des.RegisterSolver(acme.ChallengeHTTP, httpSol) } - des.RegisterSolver(acme.ChallengeTLS, tlsSol) + if tlsSol != nil { + des.RegisterSolver(acme.ChallengeTLS, tlsSol) + } + if !des.HasSolver() { + log.Fatal("no Solver available") + } log.Println("satisfice", k) if err := satisfice(des); err != nil { -- cgit v1.2.3