From 075dd20306b45837a37b4f41de9bf132ebce8467 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 3 Jun 2016 16:40:21 +0200 Subject: Experimental changes --- cmd/batch/main.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'cmd/batch/main.go') diff --git a/cmd/batch/main.go b/cmd/batch/main.go index 0be2087..964f6f3 100644 --- a/cmd/batch/main.go +++ b/cmd/batch/main.go @@ -30,20 +30,13 @@ func main() { if err != nil { log.Fatal(err) } - _ = sol - - log.Println("Dial", *provider) - prov, err := acme.DialProvider(*provider) - if err != nil { - log.Fatal(err) - } for _, c := range crt { if c.IsValid(*graceTime) && !*force { log.Println("Skip", c) continue } - csr, err := acme.NewCSR(c.PrivateKey, c.Leaf.DNSNames, c.Leaf.EmailAddresses) + csr, err := acme.NewCSR(c.PrivateKey, c.Leaf.DNSNames, acme.GetMail(c.Leaf)) if err != nil { log.Println(err) continue @@ -55,7 +48,9 @@ func main() { if err != nil { log.Fatal(err) } - sig, err := acme.NewSigner(key) + + log.Println("Dial", *provider) + prov, err := acme.DialProvider(*provider, key) if err != nil { log.Fatal(err) } @@ -68,21 +63,21 @@ func main() { con = append(con, m) log.Println("Register", con) - err = prov.Register(sig, con, agree) + err = prov.Register(con, agree) if err != nil { log.Fatal(err) } for _, domain := range *domains { log.Println("Authofize", domain) - err := prov.Authorize(sig, sol, domain) + err := prov.Authorize(sol, domain) if err != nil { log.Fatal(err) } } log.Println("Request bundle for", *domains) - cert, err := prov.Bundle(sig, key, *domains, *email) + cert, err := prov.Bundle(key, *domains, *email) if err != nil { log.Fatal(err) } -- cgit v1.2.3