aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-29 12:29:14 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-29 12:29:14 +0100
commit9650a1c86949890b991b144b667bd8424d511208 (patch)
treec8d6a4346a88ff0002a586e6ce4ff51b0468abeb /cmd
parent14a6703cfbfbe41c1925880e22b4c25ec8253fba (diff)
Add guard
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go13
1 files changed, 9 insertions, 4 deletions
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 {