aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 17:24:18 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 17:24:18 +0100
commitfa26e22f7c442c0f434685130020a8b32b6ad7d9 (patch)
tree0313b5202a648f0fa737c0f671f75baa45b81b00 /cmd
parentff2aec58ecce937232840391177e4f10d42e4085 (diff)
Encapsulate Solvers
Diffstat (limited to 'cmd')
-rw-r--r--cmd/acme/main.go13
1 files changed, 4 insertions, 9 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index b6ee054..ea9ddd0 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -84,17 +84,12 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
}
- sols := make(acme.Solvers)
-
+ sols := acme.NewSolvers()
if d.Webroot != "" {
- sols[acme.ChallengeHTTP] = acme.NewWebrootSolver(d.Webroot)
+ sols.Add(acme.NewWebrootSolver(d.Webroot))
} else {
- if httpSol != nil {
- sols[acme.ChallengeHTTP] = httpSol
- }
- if tlsSol != nil {
- sols[acme.ChallengeTLS] = tlsSol
- }
+ sols.Add(httpSol)
+ sols.Add(tlsSol)
}
for _, an := range d.Altnames {