aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-01-23 16:38:37 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-01-23 16:38:37 +0100
commit8ab5cff3997df26299926bfe767f583224a23f48 (patch)
treef1c4f4d12ea8ffa6bb9b4ba8f29c38b3915531f6
parentd0cb3267a05fae23bf15adb2df80402f97f83cab (diff)
drop webroot from desire
-rw-r--r--cmd/acme/main.go2
-rw-r--r--desire.go4
2 files changed, 2 insertions, 4 deletions
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index cf6b8bf..67271b8 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -42,7 +42,7 @@ func prepare(conf *Config) error {
for k, des := range conf.Desire {
log.Println("NewDesire", k)
- des.Desire, err = acme.NewDesire(des.Altnames, des.Webroot, des.KeySize)
+ des.Desire, err = acme.NewDesire(des.Altnames, des.KeySize)
if err != nil {
return err
}
diff --git a/desire.go b/desire.go
index 702cbcb..dc5e39e 100644
--- a/desire.go
+++ b/desire.go
@@ -18,10 +18,9 @@ type Desire struct {
key crypto.PrivateKey
cert []*x509.Certificate
solver map[ChallengeType]Solver
- webroot string
}
-func NewDesire(altnames []string, webroot string, size int) (*Desire, error) {
+func NewDesire(altnames []string, size int) (*Desire, error) {
key, err := rsa.GenerateKey(rand.Reader, size)
if err != nil {
return nil, err
@@ -30,7 +29,6 @@ func NewDesire(altnames []string, webroot string, size int) (*Desire, error) {
key: key,
altnames: altnames,
solver: make(map[ChallengeType]Solver),
- webroot: webroot,
}, nil
}