From b38218d7d0cd043e95de6ccd85b46e63aebee22b Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 15 Mar 2016 12:23:13 +0100 Subject: Restructure config --- cmd/acme/config.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'cmd/acme/config.go') diff --git a/cmd/acme/config.go b/cmd/acme/config.go index 91320e7..3e3cf40 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -28,11 +28,11 @@ type Config struct { BaseDir string KeySize int Directory string - Account []account + Desire []desire Hook map[string]string } -type account struct { +type desire struct { Mail string Phone string KeySize int @@ -92,19 +92,19 @@ func LoadConfig(fname string) (*Config, error) { c.Directory = acme.LE1 } - for i, acc := range c.Account { - if acc.KeySize == 0 { - acc.KeySize = c.KeySize + for i, des := range c.Desire { + if des.KeySize == 0 { + des.KeySize = c.KeySize } - if acc.Mail == "" { + if des.Mail == "" { return nil, errNoMail } - if acc.KeyFile == "" { - acc.KeyFile = acc.Mail + ".key" + if des.KeyFile == "" { + des.KeyFile = des.Mail + ".key" } - acc.KeyFile = path.Join(c.BaseDir, keyPath, acc.KeyFile) - c.Account[i] = acc - for i, dom := range acc.Domain { + des.KeyFile = path.Join(c.BaseDir, keyPath, des.KeyFile) + c.Desire[i] = des + for i, dom := range des.Domain { if dom.Gracetime != 0 { dom.Gracetime = c.Gracetime } @@ -123,7 +123,7 @@ func LoadConfig(fname string) (*Config, error) { } dom.KeyFile = path.Join(c.BaseDir, keyPath, dom.KeyFile) dom.CrtFile = path.Join(c.BaseDir, crtPath, dom.CrtFile) - acc.Domain[i] = dom + des.Domain[i] = dom } } -- cgit v1.2.3