From a7abf8d4dae435e2cb11d947aaa1685fc33c2b8c Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 15 Dec 2015 18:05:37 +0100 Subject: Bring pieces closer together --- cmd/acmed/config.go | 6 +++--- cmd/acmed/main.go | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/acmed/config.go b/cmd/acmed/config.go index fdd931b..faf7383 100644 --- a/cmd/acmed/config.go +++ b/cmd/acmed/config.go @@ -82,9 +82,6 @@ func LoadConfig(fname string) (*Config, error) { c.Account[k] = v } for k, v := range c.Desire { - if v.KeySize == 0 { - v.KeySize = c.Defaults.KeySize - } if v.Provider == "" { if c.Defaults.Provider != "" { v.Provider = c.Defaults.Provider @@ -101,6 +98,9 @@ func LoadConfig(fname string) (*Config, error) { } } v.account = c.Account[v.Account] + if v.KeySize == 0 { + v.KeySize = c.Defaults.KeySize + } if v.Key == "" { return nil, errNoKey } diff --git a/cmd/acmed/main.go b/cmd/acmed/main.go index b6602f7..202fe58 100644 --- a/cmd/acmed/main.go +++ b/cmd/acmed/main.go @@ -73,6 +73,4 @@ func main() { } conf.Desire[k] = des } - - log.Println(conf) } -- cgit v1.2.3