From 2ee60dbeaa032df6bfe9e50e6b57f1d68c71ae13 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 26 Feb 2016 01:00:24 +0100 Subject: Rename desire into domain --- cmd/acme/config.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'cmd/acme/config.go') diff --git a/cmd/acme/config.go b/cmd/acme/config.go index be830fd..7421229 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -39,10 +39,10 @@ type account struct { Phone string KeySize int KeyFile string - Desire []desire + Domain []domain } -type desire struct { +type domain struct { Altnames []string KeySize int KeyFile string @@ -112,22 +112,22 @@ func LoadConfig(fname string) (*Config, error) { acc.KeyFile = path.Join(c.BaseDir, acc.KeyFile) } pro.Account[i] = acc - for i, des := range acc.Desire { - if des.KeySize == 0 { - des.KeySize = c.KeySize + for i, dom := range acc.Domain { + if dom.KeySize == 0 { + dom.KeySize = c.KeySize } - if des.KeyFile == "" { + if dom.KeyFile == "" { return nil, errNoKey } - if des.CrtFile == "" { + if dom.CrtFile == "" { return nil, errNoCrt } if c.BaseDir != "" { - des.KeyFile = path.Join(c.BaseDir, des.KeyFile) - des.CrtFile = path.Join(c.BaseDir, des.CrtFile) + dom.KeyFile = path.Join(c.BaseDir, dom.KeyFile) + dom.CrtFile = path.Join(c.BaseDir, dom.CrtFile) } - des.Altnames = checkWWW(des.Altnames) - acc.Desire[i] = des + dom.Altnames = checkWWW(dom.Altnames) + acc.Domain[i] = dom } } } -- cgit v1.2.3