From 57a7772122b6a87ba67a534ba7346f1472e72cc4 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 8 Jan 2016 18:19:02 +0100 Subject: Move solver into client part, broken for now --- cmd/acme/main.go | 9 +++++++++ cmd/acme/solve_http.go | 7 ++++++- cmd/acme/solve_webroot.go | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 5567979..4534542 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -80,6 +80,15 @@ 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) + } + wg.Add(1) go func(k string, des *desire) { log.Println("process", k) diff --git a/cmd/acme/solve_http.go b/cmd/acme/solve_http.go index c23e356..7d0572b 100644 --- a/cmd/acme/solve_http.go +++ b/cmd/acme/solve_http.go @@ -1,12 +1,17 @@ package main -import "net/http" +import ( + "log" + "net/http" +) type httpChallenge struct { http.Server + Addr string } func (c *httpChallenge) Solve(token, keyAuth string) error { + log.Println("solver", c) return nil } diff --git a/cmd/acme/solve_webroot.go b/cmd/acme/solve_webroot.go index 4d62f64..13b50e0 100644 --- a/cmd/acme/solve_webroot.go +++ b/cmd/acme/solve_webroot.go @@ -19,7 +19,7 @@ func (c *webrootChallenge) Solve(token, keyAuth string) error { return err } defer fd.Close() - _, err := fd.WriteString(keyAuth) + _, err = fd.Write([]byte(keyAuth)) return err } -- cgit v1.2.3