aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-08 18:19:02 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-08 18:19:02 +0100
commit57a7772122b6a87ba67a534ba7346f1472e72cc4 (patch)
tree3f535b9cabde176eb1e8716bfe438ea351e4ae4e /cmd
parent88611642648c047f54632a98619e865d0081b6dd (diff)
Move solver into client part, broken for now
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go9
-rw-r--r--cmd/acme/solve_http.go7
-rw-r--r--cmd/acme/solve_webroot.go2
3 files changed, 16 insertions, 2 deletions
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
}