From 3c70d4c70cc99d30df86fa074b7b2c3c1cd054dc Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 12 Jan 2016 16:30:23 +0100 Subject: Store webroot in desire (not used now) --- cmd/acme/main.go | 2 +- desire.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/acme/main.go b/cmd/acme/main.go index df6f7a0..e21ee4a 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -49,7 +49,7 @@ func main() { go func(k string, des *desire) { defer wg.Done() log.Println("NewDesire", k) - des.Desire, err = acme.NewDesire(des.Altnames, des.KeySize) + des.Desire, err = acme.NewDesire(des.Altnames, des.Webroot, des.KeySize) if err != nil { log.Fatal(err) } diff --git a/desire.go b/desire.go index c631548..6a8cded 100644 --- a/desire.go +++ b/desire.go @@ -13,6 +13,7 @@ type Desire struct { key *rsa.PrivateKey cert []*x509.Certificate solver map[ChallengeType]Solver + webroot string } // Solver decribes a solving interface @@ -22,7 +23,7 @@ type Solver interface { const WellKnown = `/.well-known/acme-challenge/` -func NewDesire(altnames []string, size int) (*Desire, error) { +func NewDesire(altnames []string, webroot string, size int) (*Desire, error) { key, err := rsa.GenerateKey(rand.Reader, size) if err != nil { return nil, err @@ -31,6 +32,7 @@ func NewDesire(altnames []string, size int) (*Desire, error) { key: key, altnames: altnames, solver: make(map[ChallengeType]Solver), + webroot: webroot, }, nil } -- cgit v1.2.3