From 3ed9bdad5be04f36d7379eca6321d98139e6ac1a Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 15 Feb 2016 19:43:28 +0100 Subject: Rename BaseDir --- cmd/acme/config.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/acme/config.go b/cmd/acme/config.go index e291f4b..e58aad7 100644 --- a/cmd/acme/config.go +++ b/cmd/acme/config.go @@ -17,7 +17,7 @@ type Config struct { Gracetime time.Duration Listen string ListenTLS string - Basedir string + BaseDir string KeySize int Provider map[string]string Account map[string]account @@ -62,12 +62,12 @@ func LoadConfig(fname string) (*Config, error) { if err != nil { return nil, err } - if c.Basedir != "" && strings.HasPrefix(c.Basedir, "~") { + if strings.HasPrefix(c.BaseDir, "~") { usr, err := user.Current() if err != nil { return nil, err } - c.Basedir = path.Join(usr.HomeDir, c.Basedir[1:]) + c.BaseDir = path.Join(usr.HomeDir, c.BaseDir[1:]) } // apply defaults if c.KeySize == 0 { @@ -83,8 +83,8 @@ func LoadConfig(fname string) (*Config, error) { if v.Key == "" { return nil, errNoKey } - if c.Basedir != "" { - v.Key = path.Join(c.Basedir, v.Key) + if c.BaseDir != "" { + v.Key = path.Join(c.BaseDir, v.Key) } c.Account[k] = v } @@ -104,9 +104,9 @@ func LoadConfig(fname string) (*Config, error) { if v.Cert == "" { return nil, errNoCert } - if c.Basedir != "" { - v.Key = path.Join(c.Basedir, v.Key) - v.Cert = path.Join(c.Basedir, v.Cert) + if c.BaseDir != "" { + v.Key = path.Join(c.BaseDir, v.Key) + v.Cert = path.Join(c.BaseDir, v.Cert) } switch len(v.Altnames) { case 0: -- cgit v1.2.3