aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 09:45:01 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 09:45:01 +0100
commitff2aec58ecce937232840391177e4f10d42e4085 (patch)
tree218f4ff403806b4f4c7f5b747223114d4d9554e0 /cmd
parent3d02f4993743b6d4010c87afc168bfd08ffd1e70 (diff)
Drop Desire type
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go15
1 files changed, 10 insertions, 5 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index cda91e0..b6ee054 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -84,17 +84,22 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
}
- des := acme.NewDesire()
+ sols := make(acme.Solvers)
+
if d.Webroot != "" {
- des.RegisterSolver(acme.NewWebrootSolver(d.Webroot))
+ sols[acme.ChallengeHTTP] = acme.NewWebrootSolver(d.Webroot)
} else {
- des.RegisterSolver(httpSol)
- des.RegisterSolver(tlsSol)
+ if httpSol != nil {
+ sols[acme.ChallengeHTTP] = httpSol
+ }
+ if tlsSol != nil {
+ sols[acme.ChallengeTLS] = tlsSol
+ }
}
for _, an := range d.Altnames {
log.Println("Authorize", an)
- if err := prov.Authorize(acc, des, an); err != nil {
+ if err := prov.Authorize(acc, sols, an); err != nil {
return err
}
}