aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-29 15:10:05 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-29 15:10:05 +0100
commitbe674b720a91bbb0f69b4eb3f5bbeb3970028637 (patch)
tree80a51b63fbd3d1ce7ccdebf3b0f836d3b6183664
parent919875a65fc7f343e5ed6309fd45bd1c35e63f87 (diff)
cleanup
-rw-r--r--cmd/acme/main.go7
-rw-r--r--solve_http.go6
-rw-r--r--solve_tls.go6
3 files changed, 13 insertions, 6 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index cd2c304..ea4151f 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -82,10 +82,6 @@ func main() {
log.Fatal(err)
}
- if err := prepare(conf); err != nil {
- log.Fatal(err)
- }
-
var httpSol, tlsSol acme.Solver
if conf.Defaults.Listen != "" {
httpSol, err = acme.NewHTTPSolver(conf.Defaults.Listen)
@@ -99,6 +95,9 @@ func main() {
log.Println(err)
}
}
+ if err := prepare(conf); err != nil {
+ log.Fatal(err)
+ }
for k, des := range conf.Desire {
if des.Webroot != "" {
diff --git a/solve_http.go b/solve_http.go
index 173745c..308ef9f 100644
--- a/solve_http.go
+++ b/solve_http.go
@@ -15,7 +15,11 @@ func NewHTTPSolver(addr string) (Solver, error) {
s := &httpSolver{
Server: http.Server{Addr: addr},
}
- go s.ListenAndServe()
+ go func() {
+ if err := s.ListenAndServe(); err != nil {
+ log.Fatal(err)
+ }
+ }()
return s, nil
}
diff --git a/solve_tls.go b/solve_tls.go
index 2633ce1..4941ab6 100644
--- a/solve_tls.go
+++ b/solve_tls.go
@@ -43,7 +43,11 @@ func NewTLSSolver(addr string) (Solver, error) {
GetCertificate: s.getCert,
}
s.Server.TLSConfig = config
- go s.ListenAndServeTLS("", "")
+ go func() {
+ if err := s.ListenAndServeTLS("", ""); err != nil {
+ log.Fatal(err)
+ }
+ }()
return s, nil
}