aboutsummaryrefslogtreecommitdiff
path: root/cmd/acme/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-26 18:57:38 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-26 18:57:38 +0100
commit6d0e780f951789cdac7f9f60ca5b373ab8d44ca1 (patch)
treec9876e8b26fcc69485891b914e858bf1b36a290d /cmd/acme/main.go
parent4592f4d489b16dafcc75a3aa26b48a415370e237 (diff)
Switch to lib-internal solver
Diffstat (limited to 'cmd/acme/main.go')
-rw-r--r--cmd/acme/main.go14
1 files changed, 10 insertions, 4 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index 67271b8..00c209f 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -63,9 +63,6 @@ func satisfice(des *desire) error {
}
}
- hs := &httpChallenge{Webroot: des.Webroot}
- des.RegisterSolver(acme.ChallengeHTTP, hs)
-
err = des.provider.Authz(des.account, des.Desire)
if err != nil {
return err
@@ -92,8 +89,17 @@ func main() {
if err := prepare(conf); err != nil {
log.Fatal(err)
}
- httpSolver(conf.Defaults.Listen)
+
+ httpSol := acme.NewHTTPSolver(conf.Defaults.Listen)
+
for k, des := range conf.Desire {
+ if des.Webroot != "" {
+ wrSol := acme.NewWebrootSolver(des.Webroot)
+ des.RegisterSolver(acme.ChallengeHTTP, wrSol)
+ } else {
+ des.RegisterSolver(acme.ChallengeHTTP, httpSol)
+ }
+
log.Println("satisfice", k)
if err := satisfice(des); err != nil {
log.Fatal(err)